linux-kernel - linux-next: manual merge of the vfs-brauner tree with the ext3 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>] [day] [month] [year] [list]

Message-ID: <20240906083246.599063b0@canb.auug.org.au>
Date: Fri, 6 Sep 2024 08:32:46 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christian Brauner <brauner@...nel.org>, Jan Kara <jack@...e.cz>
Cc: Jeff Layton <jlayton@...nel.org>, 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 vfs-brauner tree with the ext3 tree

Hi all,

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

  fs/btrfs/super.c

between commit:

  ec24789ec8d6 ("btrfs: disable defrag on pre-content watched files")

from the ext3 tree and commit:

  c7e408a168b5 ("btrfs: convert to multigrain timestamps")

from the vfs-brauner 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/btrfs/super.c
index c9aef6708779,d423acfe11d0..000000000000
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -2199,7 -2199,7 +2199,7 @@@ static struct file_system_type btrfs_fs
  	.parameters		= btrfs_fs_parameters,
  	.kill_sb		= btrfs_kill_super,
  	.fs_flags		= FS_REQUIRES_DEV | FS_BINARY_MOUNTDATA |
- 				  FS_ALLOW_IDMAP | FS_ALLOW_HSM,
 -				  FS_ALLOW_IDMAP | FS_MGTIME,
++				  FS_ALLOW_IDMAP | FS_ALLOW_HSM | FS_MGTIME,
   };
  
  MODULE_ALIAS_FS("btrfs");

Content of type "application/pgp-signature" skipped