Received-SPF: pass (google.com: domain of linux-kernel+bounces-82681-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: Tue, 27 Feb 2024 15:37:16 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle.com>, Christian Brauner
 <brauner@kernel.org>
Cc: Bart Van Assche <bvanassche@acm.org>, Chuck Lever
 <chuck.lever@oracle.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 scsi-mkp tree with the vfs-brauner
 tree
Message-ID: <20240227153716.43e5cbad@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/GhCxABn2pMVAxSw4uUz6Pmz";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  include/linux/fs.h

between commit:

  0e4a862174f2 ("libfs: Convert simple directory offsets to use a Maple Tre=
e")

from the vfs-brauner tree and commit:

  fe3944fb245a ("fs: Move enum rw_hint into a new header file")

from the scsi-mkp 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/fs.h
index f69c082e0f16,bdabda5dc364..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -43,7 -43,7 +43,8 @@@
  #include <linux/cred.h>
  #include <linux/mnt_idmapping.h>
  #include <linux/slab.h>
 +#include <linux/maple_tree.h>
+ #include <linux/rw_hint.h>
 =20
  #include <asm/byteorder.h>
  #include <uapi/linux/fs.h>

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXdZvwACgkQAVBC80lX
0GxD/Qf+IABQenKyfyNHoAUuUEX6HKcUDHqYYF6dOtvDa9IbOSbGXmn8oBpSb5lw
qlczuXZVVQME4RJvYZUurunfIMwdEKzWs67Dr4n+zqkgBpvDpYkJSg0R8H4C/gYr
VxDW4h3ouWjAeotAOgz97hPUCmc+QaAnuQf/LTAu6uYNrstfT7vJwWwAUHDB5kh5
W2LSDGS2VENpbOEsXwI7NZcuJRyXokSG9HB4Zc2fP5+HXOua6vcUsaxYd28fl2zN
COqZq9ZtuIr1D6iJkrSDXnbLMhf+OvoqXlWKq6Sb6f2TuGT22i/yXQG3L6b6C49Y
QmqQwqkt1kUxiCU8QHFwGfyjdSqKCw==
=jmVI
-----END PGP SIGNATURE-----

--Sig_/GhCxABn2pMVAxSw4uUz6Pmz--