Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Date:   Thu, 26 Oct 2023 10:01:57 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christian Brauner <brauner@kernel.org>,
        Kent Overstreet <kent.overstreet@linux.dev>
Cc:     Amir Goldstein <amir73il@gmail.com>,
        Kent Overstreet <kent.overstreet@gmail.com>,
        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: <20231026100157.735d7dee@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/VmBDWPP88GD83wpyU+t3/kY";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/VmBDWPP88GD83wpyU+t3/kY
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:

  include/linux/exportfs.h

between commit:

  85e95ca7cc48 ("bcachefs: Update export_operations for snapshots")

from the bcachefs tree and commit:

  2560fa66d2ac ("exportfs: define FILEID_INO64_GEN* file handle types")

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 include/linux/exportfs.h
index be9900cc8786,21bae8bfeef1..000000000000
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@@ -98,12 -98,17 +98,23 @@@ enum fid_type=20
  	 */
  	FILEID_FAT_WITH_PARENT =3D 0x72,
 =20
 +	/*
 +	 * 64 bit inode number, 32 bit subvolume, 32 bit generation number:
 +	 */
 +	FILEID_BCACHEFS_WITHOUT_PARENT =3D 0x80,
 +	FILEID_BCACHEFS_WITH_PARENT =3D 0x81,
 +
+ 	/*
+ 	 * 64 bit inode number, 32 bit generation number.
+ 	 */
 -	FILEID_INO64_GEN =3D 0x81,
++	FILEID_INO64_GEN =3D 0x82,
+=20
+ 	/*
+ 	 * 64 bit inode number, 32 bit generation number,
+ 	 * 64 bit parent inode number, 32 bit parent generation.
+ 	 */
 -	FILEID_INO64_GEN_PARENT =3D 0x82,
++	FILEID_INO64_GEN_PARENT =3D 0x83,
+=20
  	/*
  	 * 128 bit child FID (struct lu_fid)
  	 * 128 bit parent FID (struct lu_fid)

--Sig_/VmBDWPP88GD83wpyU+t3/kY
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU5nmUACgkQAVBC80lX
0Gy5Cgf+ImxdRgkOccozxtWZmpzqfmWeCkp9lsvmKvvwYLK86OuFS/pw6UD1S0y0
xRQLPHujQL6TRJlbpna/D34zSDAmzlDczJh3ClwG8vzZ2BWfw64r0b6hmVQVQA+4
e4eBHmEB9lb9QCEM0HpBDCYSuTtOh2uOs95g2g0n+PD8uhy5oQjTHhIn8gN0g91T
XNoJikAsJVbBknFO+cTZ/Sqt+8ThwMlb9cOQu3nFYUiUjNFbOkm7RN9lVJP4UBdW
cMs3oje8eMe72+LLACasA6eW5oxaOGHD6sx0wCT4MlwEnkl+Xu97f9YTJxa8hJrR
OfeAWe1Pp2c1+QKovnBUA8avT4GOEA==
=czoY
-----END PGP SIGNATURE-----

--Sig_/VmBDWPP88GD83wpyU+t3/kY--