linux-next: manual merge of the ext3 tree with the bcachefs tree

Posted by Stephen Rothwell 6 months, 3 weeks ago

Hi all,

Today's linux-next merge of the ext3 tree got a conflict in:

  fs/bcachefs/fs.c

between commit:

  455d3317bebd ("bcachefs: support idmap mounts")

from the bcachefs tree and commit:

  fff071a45705 ("bcachefs: add pre-content fsnotify hook to fault")

from the ext3 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 fs/bcachefs/fs.c
index 486b9eba287a,f889a105643b..000000000000
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@@ -2250,7 -2124,7 +2250,7 @@@ static struct file_system_type bcache_f
  	.name			= "bcachefs",
  	.init_fs_context	= bch2_init_fs_context,
  	.kill_sb		= bch2_kill_sb,
- 	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,
 -	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_HSM,
++	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_ALLOW_HSM,
  };
  
  MODULE_ALIAS_FS("bcachefs");

Re: linux-next: manual merge of the ext3 tree with the bcachefs tree

Posted by Stephen Rothwell 6 months ago

Hi all,

On Fri, 6 Sep 2024 08:19:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the ext3 tree got a conflict in:
> 
>   fs/bcachefs/fs.c
> 
> between commit:
> 
>   455d3317bebd ("bcachefs: support idmap mounts")
> 
> from the bcachefs tree and commit:
> 
>   fff071a45705 ("bcachefs: add pre-content fsnotify hook to fault")
> 
> from the ext3 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.
> 
> diff --cc fs/bcachefs/fs.c
> index 486b9eba287a,f889a105643b..000000000000
> --- a/fs/bcachefs/fs.c
> +++ b/fs/bcachefs/fs.c
> @@@ -2250,7 -2124,7 +2250,7 @@@ static struct file_system_type bcache_f
>   	.name			= "bcachefs",
>   	.init_fs_context	= bch2_init_fs_context,
>   	.kill_sb		= bch2_kill_sb,
> - 	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,
>  -	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_HSM,
> ++	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP | FS_ALLOW_HSM,
>   };
>   
>   MODULE_ALIAS_FS("bcachefs");

This is now a conflict between the ext3 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell