Received-SPF: pass (google.com: domain of linux-kernel+bounces-6110-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Wed, 20 Dec 2023 10:47:34 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Chao Yu <chao@kernel.org>, Jan Kara <jack@suse.cz>, Linux Kernel Mailing
 List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the vfs tree with the f2fs tree
Message-ID: <20231220104734.0979a9f8@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5=M40P7dLA5C/mRQPI=9M=u";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/5=M40P7dLA5C/mRQPI=9M=u
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/f2fs/namei.c

between commit:

  53edb549565f ("f2fs: fix to avoid dirent corruption")

from the f2fs tree and commit:

  7deee77b993a ("f2fs: Avoid reading renamed directory if parent does not c=
hange")

from the vfs 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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/f2fs/namei.c
index ede6afb81762,fdc97df6bb85..000000000000
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@@ -1104,8 -1106,8 +1105,8 @@@ static int f2fs_rename(struct mnt_idma
  		iput(whiteout);
  	}
 =20
- 	if (old_dir_entry) {
- 		if (old_dir !=3D new_dir)
+ 	if (old_is_dir) {
 -		if (old_dir_entry && !whiteout)
++		if (old_dir_entry)
  			f2fs_set_link(old_inode, old_dir_entry,
  						old_dir_page, new_dir);
  		else

--Sig_/5=M40P7dLA5C/mRQPI=9M=u
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWCK5YACgkQAVBC80lX
0Gw4qwf+PrXULbmLGlG3NKze/3B5ZSapHarkOg4bEeMAqWy9R9kUjDf2F13jk294
NVuiXgagmCdUdGO8BVv5V1/j6TmCegD7CdxRl5cZr4PEOYL7/mwCk39ao5HjAXEA
KPDc1MiZB9fTmX5EM6y99KXGJ+GX9s6fMl6Mm3iImU10b6eSPuGNhkau1UJQrEb6
evJl/uqMtNcN0QE+X6CqXIugQmj9uWpgD7N+PMASLKJbrWfs5AbJwJ90YJ0lhdvm
qkV9vl1NDtgBWfBURzQXXN1uAdBKFUSZZwj17S9lqfPqqb9+wgZa5P4XHtk+YhS/
NhpbpZbF1n879QUv+/c0w+qGL3B6cw==
=OCYL
-----END PGP SIGNATURE-----

--Sig_/5=M40P7dLA5C/mRQPI=9M=u--