Received-SPF: pass (google.com: domain of linux-kernel+bounces-91457-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Tue, 5 Mar 2024 11:35:02 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>, 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: <20240305113502.50980f88@canb.auug.org.au>
In-Reply-To: <ZeC7OEA4Onoi-mED@google.com>
References: <20240229104140.2927da29@canb.auug.org.au>
	<ZeC7OEA4Onoi-mED@google.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/oRJlkEHKcsgvBkXqxPsyIe6";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi Jaegeuk,

On Thu, 29 Feb 2024 09:13:28 -0800 Jaegeuk Kim <jaegeuk@kernel.org> wrote:
>
> On 02/29, Stephen Rothwell 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
>=20
> fyi; I dropped the above commit in -dev.

And it seems to have come back as commit

  45809cd3bdac ("f2fs: introduce SEGS_TO_BLKS/BLKS_TO_SEGS for cleanup")

(which is fine, but the conflict has returned).

> > 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
> > --=20
> > Cheers,
> > Stephen Rothwell
> >=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);
> >   			}
> >   		} =20

--=20
Cheers,
Stephen Rothwell

--Sig_/oRJlkEHKcsgvBkXqxPsyIe6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXmaLYACgkQAVBC80lX
0GzIEQf+Nr7j63ZtcVQULgGJvkNDDgjoF6q3Y2b/Dgc+nwd9RrXMHP5uWM70hOok
2XOU081BQ/+s4/wOWGaP8iKENH5dCKUXlyE3mBnMfwxX9v2KqiIMIkBEv1Mlub0r
npC4XvwZB/2LNgrmQsdkVi/CIw4DHsjmwciS8BSu/rI0cApaeHjepqF/9WTeTAuv
GbrFt1aZQvHEve2k4Aay3MfrdRkVD/n4cF8hFyq/+MjfIfZnmvlgklPzfW/aa4f3
e/ACrwEnk+E4WM6U/n060yVsk8lZOr14fb3uIS5ZTzqNvhKyoZJmhHVwf+mkA4Lx
HyWxwvxnaz3HRESvcby91iW4x8zMng==
=xfij
-----END PGP SIGNATURE-----

--Sig_/oRJlkEHKcsgvBkXqxPsyIe6--