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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240906081944.105579fc@canb.auug.org.au>
Date: Fri, 6 Sep 2024 08:19:44 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jan Kara <jack@...e.cz>, Kent Overstreet <kent.overstreet@...ux.dev>
Cc: Hongbo Li <lihongbo22@...wei.com>, Josef Bacik <josef@...icpanda.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the ext3 tree with the bcachefs tree

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");

Content of type "application/pgp-signature" skipped