Received-SPF: pass (google.com: domain of linux-kernel+bounces-62518-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Tue, 13 Feb 2024 10:04:55 +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>, Su Yue <glass.su@suse.com>
Subject: linux-next: manual merge of the vfs-brauner tree with the bcachefs
 tree
Message-ID: <20240213100455.07e181c8@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/H0EfUVqgf5.7zwqJumzUvD/";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/H0EfUVqgf5.7zwqJumzUvD/
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/bcachefs/super-io.c

between commit:

  7dcfb87af973 ("bcachefs: fix kmemleak in __bch2_read_super error handling=
 path")

from the bcachefs tree and commit:

  1df39a40e912 ("bcachefs: port block device access to file")

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/bcachefs/super-io.c
index 36988add581f,ce8cf2d91f84..000000000000
--- a/fs/bcachefs/super-io.c
+++ b/fs/bcachefs/super-io.c
@@@ -715,11 -715,11 +715,11 @@@ 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);
 -		goto out;
 +		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) {

--Sig_/H0EfUVqgf5.7zwqJumzUvD/
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXKpBcACgkQAVBC80lX
0Gzx+wf6An58J97tEuatYeYEIt8pk1bEdS9bSUaYQ8Snn3y9gsGi2ipO7w+sjS5s
h57DFCILTvyM0IkpPMUzxkjeZMkoudQyGR0Xib5tvHb9FmYN8jSGln/5XLdOoATK
aPJ3UP/la8W+I1IVsZVjiE13p+6xTw1XxT7uIJocoowuWMfB7CqZ5j2DF9/W/Non
mgr5ADxt8e0tn9060ad6bpgBo1usE0iYezXOiGFleipDEPNnrqNyow8/2UjrbS8r
XtxXR2z96LbotYx1aVwmzwxwu6mrb/pEaXtk1+ZualT5XiSHgFuo3V8W+T+p73Qb
EQo98cOpiaioRVD5dSkdI+UrFezMcQ==
=DFQ6
-----END PGP SIGNATURE-----

--Sig_/H0EfUVqgf5.7zwqJumzUvD/--