Received-SPF: pass (google.com: domain of linux-kernel+bounces-85855-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Thu, 29 Feb 2024 10:41:40 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Chao Yu <chao@kernel.org>, 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-brauner tree with the f2fs tree
Message-ID: <20240229104140.2927da29@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/GpWvX.Cj0lAD8MvDECNps63";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/GpWvX.Cj0lAD8MvDECNps63
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/f2fs/super.c

between commit:

  5fa6a97d2784 ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")

from the f2fs tree and commit:

  512383ae4910 ("f2fs: port block device access to files")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/f2fs/super.c
index 09ffdd554f9c,09e82624eff5..000000000000
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@@ -4206,9 -4265,9 +4206,9 @@@ static int f2fs_scan_devices(struct f2f
  			} else {
  				FDEV(i).start_blk =3D FDEV(i - 1).end_blk + 1;
  				FDEV(i).end_blk =3D FDEV(i).start_blk +
 -					(FDEV(i).total_segments <<
 -					sbi->log_blocks_per_seg) - 1;
 +						SEGS_TO_BLKS(sbi,
 +						FDEV(i).total_segments) - 1;
- 				FDEV(i).bdev_handle =3D bdev_open_by_path(
+ 				FDEV(i).bdev_file =3D bdev_file_open_by_path(
  					FDEV(i).path, mode, sbi->sb, NULL);
  			}
  		}

--Sig_/GpWvX.Cj0lAD8MvDECNps63
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXfxLQACgkQAVBC80lX
0GyAsQf/a50gfQPcayNMWMeXSkK8TVukXrl/SkmUN9s9c/Z9Ycyf+NCyNP1iOo9U
oLn7M1lksGbck7d+ZeEzQuWLSi81MHGrVD25Dogr8Pl9EXE6vnRm+/vAHxa4UXCr
pfX3wdOa2jexUXBi5CSaW+3XCa4lGIRPYOxohEVGr02j+LYzoOMwsh+5pHkWvKsf
ywlUOalFkY53px9l9+5HXAUDteDbrzdJOQzz8yfr3bMcN91q16w6yaZdNnEPdAYZ
NPHYxjxiGxNxyuk3CdR//crQocWkHW0VRurO6SS9GTMA8DY0i9l0ac5bLgmKVx5F
ZXkXosXoaZiw0bkb0T8TF5bqTb1YPg==
=5o7i
-----END PGP SIGNATURE-----

--Sig_/GpWvX.Cj0lAD8MvDECNps63--