Received-SPF: pass (google.com: domain of linux-kernel+bounces-99805-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Tue, 12 Mar 2024 14:56:32 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Kent Overstreet
 <kent.overstreet@linux.dev>
Cc: 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
 bcachefs tree
Message-ID: <20240312145632.61aa94b3@canb.auug.org.au>
In-Reply-To: <20240226111257.2784c310@canb.auug.org.au>
References: <20240226111257.2784c310@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/U_7LVwMzTdyk8yZ7idQwKOz";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

On Mon, 26 Feb 2024 11:12:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>=20
>   fs/bcachefs/super-io.c
>=20
> between commit:
>=20
>   2881c58d14b6 ("bcachefs: bch2_print_opts()")
>=20
> from the bcachefs tree and commit:
>=20
>   9f2f767f5ef8 ("bcachefs: port block device access to file")
>=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/bcachefs/super-io.c
> index 38a5073202c5,bd64eb68e84a..000000000000
> --- a/fs/bcachefs/super-io.c
> +++ b/fs/bcachefs/super-io.c
> @@@ -715,12 -715,11 +715,12 @@@ retry
>   			opt_set(*opts, nochanges, true);
>   	}
>  =20
> - 	if (IS_ERR(sb->bdev_handle)) {
> - 		ret =3D PTR_ERR(sb->bdev_handle);
> + 	if (IS_ERR(sb->s_bdev_file)) {
> + 		ret =3D PTR_ERR(sb->s_bdev_file);
>  +		prt_printf(&err, "error opening %s: %s", path, bch2_err_str(ret));
>   		goto err;
>   	}
> - 	sb->bdev =3D sb->bdev_handle->bdev;
> + 	sb->bdev =3D file_bdev(sb->s_bdev_file);
>  =20
>   	ret =3D bch2_sb_realloc(sb, 0);
>   	if (ret) {

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

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXv0nAACgkQAVBC80lX
0Gx3dgf+J1fXi/0QYbYQm3UOTItL8pNhwwACtf5m+5MqJr+hx1aGzew4M9wRpFQp
x3zaoHNUNFQIRi9jg1gW5wLs0WycH4HyS62sgsDFTL3kgtUvibrHPTTrJVakNwXM
3vvMZmCY7djwdHzF4qqsgNgu3z/dRJLrD1eG9P/fzhlvcdGEH596IwxDq82bHRMe
wHZ4Y8pDHJi5iLd6Ioxn0gfkV5cpAyY+ZfbN+7FMlKhR1b6Y92xrLiAHTZLmlKbY
Q+OeW9wkdRoWbvOQPaZqRsuwHYfNRQq8gtjbEYgM1vqW6X6yoYx8bPlyYqbHmeKw
Xg1sN+QOg9C5AMjRlzUe766w0sjW2Q==
=Zo91
-----END PGP SIGNATURE-----

--Sig_/U_7LVwMzTdyk8yZ7idQwKOz--