Messages in this thread | | | Date | Fri, 17 Dec 2021 11:07:20 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the fscache tree with the asm-generic tree |
| |
Hi all,
Today's linux-next merge of the fscache tree got a conflict in:
Documentation/filesystems/caching/fscache.rst
between commits:
d881c06e0890 ("Documentation, arch: Remove leftovers from fscache/cachefiles histograms") 5c61c384095a ("Documentation, arch, fs: Remove leftovers from fscache object list")
from the asm-generic tree and commit:
ac1c0f96f4c0 ("fscache: Rewrite documentation")
from the fscache tree.
I fixed it up (I just used the latter version) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |