Received-SPF: pass (google.com: domain of linux-kernel+bounces-66100-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: Thu, 15 Feb 2024 10:05:17 +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: <20240215100517.027fd255@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ZTW6UhUTc9z3Ddl8pr43EyZ";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/ZTW6UhUTc9z3Ddl8pr43EyZ
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 commits:

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

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 a3a9e85ab03c,ce8cf2d91f84..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);
 -		goto out;
 +		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_/ZTW6UhUTc9z3Ddl8pr43EyZ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXNRy0ACgkQAVBC80lX
0GylSAgAgckT6Yo2yZVsXcTFHOVNTZSuX+mwLH4JK471+gizpoUND031R8MoX9tB
qxGFjGI+scbi+wS8QGssNZ3KKGxFUS3W+ZJQvRBuTyv93s9mstIR2+jpeYShtI0q
hn+ENcocrTGwqZJcbQEJ4YDwaWfh00oWLYF4Dfu7KfejTV4CyyWO23+SFkLNJKcm
ZU5VNMeaMkCsK+c0JEiiwmWNXaRhgEE5DmxMGhd+oty3tPd5LPggbF/0MTfRJWzz
3sA9lpdXADcyQYaenxHtyZV1mzw/AtKYOovwfaNImC3Imb7z+6+OWLfKl9ZP0qmR
wqs9k8LGS2aNHaVBhTocEKOydels4A==
=rbx2
-----END PGP SIGNATURE-----

--Sig_/ZTW6UhUTc9z3Ddl8pr43EyZ--