Messages in this thread | | | Date | Tue, 27 Feb 2024 15:37:16 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree |
| |
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
include/linux/fs.h
between commit:
0e4a862174f2 ("libfs: Convert simple directory offsets to use a Maple Tree")
from the vfs-brauner tree and commit:
fe3944fb245a ("fs: Move enum rw_hint into a new header file")
from the scsi-mkp tree.
I fixed it up (see below) 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
diff --cc include/linux/fs.h index f69c082e0f16,bdabda5dc364..000000000000 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@@ -43,7 -43,7 +43,8 @@@ #include <linux/cred.h> #include <linux/mnt_idmapping.h> #include <linux/slab.h> +#include <linux/maple_tree.h> + #include <linux/rw_hint.h> #include <asm/byteorder.h> #include <uapi/linux/fs.h> [unhandled content-type:application/pgp-signature] | |