Received-SPF: pass (google.com: domain of linux-kernel+bounces-99810-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 12 Mar 2024 15:02:28 +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: Re: linux-next: manual merge of the vfs-brauner tree with the f2fs
 tree
Message-ID: <20240312150228.31190b3c@canb.auug.org.au>
In-Reply-To: <20240229104140.2927da29@canb.auug.org.au>
References: <20240229104140.2927da29@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/pFeyoMquibdqUJ=FIlQlIiY";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/pFeyoMquibdqUJ=FIlQlIiY
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 29 Feb 2024 10:41:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>=20
>   fs/f2fs/super.c
>=20
> between commit:
>=20
>   5fa6a97d2784 ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")
>=20
> from the f2fs tree and commit:
>=20
>   512383ae4910 ("f2fs: port block device access to files")
>=20
> from the vfs-brauner tree.
>=20
> 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
> 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);
>   			}
>   		}

This is now a conflict between the f2fs tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/pFeyoMquibdqUJ=FIlQlIiY
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXv09QACgkQAVBC80lX
0GxTMQf/ZOA3yXMwPh52RY76VAhqrcGgY7TSrfDmLEbKOGZp9dLEV7D27bTzdpaQ
mLjd/J/CXTBJ8lGNn5CTIT7XhLNplJRj65pWQk/yW2VewWgveQdOETKBFQPrd0Ak
rPhYFOGyMLXxW7l7dwpTOkceXgzir4vSjYhMJJykDQabmziN5vAhJNFB1TOR8C08
vmUBNrpfBCoNzgYPLInF8BdnX5VO6AS+4r2kOtyjxJtH92jiJonFFIdnfFG9RfKb
1TCJpjscC1jVkwX/R5Fp+RMIPrCQjkJbVHh5xi6koQnSnSgfrfZJG5xm9VenuOga
b9NXeh2BGXpFRXUas8CMKspUKjcSfA==
=rMU4
-----END PGP SIGNATURE-----

--Sig_/pFeyoMquibdqUJ=FIlQlIiY--