Received-SPF: pass (google.com: domain of linux-kernel+bounces-80352-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Mon, 26 Feb 2024 11:12:57 +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: linux-next: manual merge of the vfs-brauner tree with the bcachefs
 tree
Message-ID: <20240226111257.2784c310@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/FvBqIVN51gPF3Kh4_DJXSW4";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/FvBqIVN51gPF3Kh4_DJXSW4
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:

  2881c58d14b6 ("bcachefs: bch2_print_opts()")

from the bcachefs tree and commit:

  9f2f767f5ef8 ("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 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) {

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXb14kACgkQAVBC80lX
0GxGLwf/VasNqJLG2gFU6NLzcOAQsarVv4NieTIW1V8HCCWR7M/s5ATTlVY0t0AZ
cpwl2dGNSiNK5UzyzZm2LjTGxy2DTl1s3+wp7S0gwuzaSVQR0N3jgjCofeMHkvA7
abLIOJjnnQB5Fb2hGe2fsjc6p5x1SLoaxn6WGYiQd6dzDAMRQsgTLLNrxlUv0ukd
ewEKvtoGeYDOzpz+RLeSExewOmEHOm5Fh8/X8VvC1iBovvWThs7qhp63xkPG665c
p6JGa515xm2w7/9JyGYyj6/1lHY8XTcmodzXOynnGxx4gQ6y6vtrQuNqHZI6GPoW
+7r1FNEldJpUztP9k7e9I0goparVOw==
=0J84
-----END PGP SIGNATURE-----

--Sig_/FvBqIVN51gPF3Kh4_DJXSW4--