linux-kernel - linux-next: manual merge of the vfs-brauner tree with the f2fs 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: <20250714082510.4226b91d@canb.auug.org.au>
Date: Mon, 14 Jul 2025 08:25:10 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christian Brauner <brauner@...nel.org>, Jaegeuk Kim <jaegeuk@...nel.org>
Cc: Eric Sandeen <sandeen@...hat.com>, Hongbo Li <lihongbo22@...wei.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Qu Wenruo <wqu@...e.com>
Subject: linux-next: manual merge of the vfs-brauner tree with the f2fs tree

Hi all,

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

  fs/f2fs/super.c

between commit:

  a0512c55d7f8 ("f2fs: switch to the new mount api")

from the f2fs tree and commit:

  165fa94de612 ("fs: enhance and rename shutdown() callback to remove_bdev()")

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/f2fs/super.c
index 30c038413040,8667af9f76e4..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -3507,7 -3263,8 +3507,7 @@@ static const struct super_operations f2
  	.freeze_fs	= f2fs_freeze,
  	.unfreeze_fs	= f2fs_unfreeze,
  	.statfs		= f2fs_statfs,
- 	.shutdown	= f2fs_shutdown,
 -	.remount_fs	= f2fs_remount,
+ 	.remove_bdev	= f2fs_remove_bdev,
  };
  
  #ifdef CONFIG_FS_ENCRYPTION

Content of type "application/pgp-signature" skipped