Date:   Tue, 21 Feb 2023 11:39:42 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Steve French <smfrench@gmail.com>
Cc:     Jens Axboe <axboe@kernel.dk>, CIFS <linux-cifs@vger.kernel.org>,
        Christoph Hellwig <hch@lst.de>,
        David Howells <dhowells@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Steve French <stfrench@microsoft.com>
Subject: Re: linux-next: manual merge of the block tree with the cifs tree
Message-ID: <20230221113942.0d0ca13c@canb.auug.org.au>
In-Reply-To: <20230220115056.22751cf6@canb.auug.org.au>
References: <20230220115056.22751cf6@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/7GsqgIcHxyht7J.Uk0ahOQ/";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/7GsqgIcHxyht7J.Uk0ahOQ/
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 20 Feb 2023 11:50:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the block tree got a conflict in:
>=20
>   fs/cifs/smb2ops.c
>=20
> between commit:
>=20
>   8378eea2e41f ("cifs: Change the I/O paths to use an iterator rather tha=
n a page list")
>=20
> from the cifs tree and commit:
>=20
>   220ae4a5c2ba ("cifs: use bvec_set_page to initialize bvecs")
>=20
> from the block tree.
>=20
> I fixed it up (the former removed the code updated by the latter) 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.

This is now a conflict between the cifs tree and Linus' tree.
--=20
Cheers,
Stephen Rothwell

--Sig_/7GsqgIcHxyht7J.Uk0ahOQ/
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmP0Es4ACgkQAVBC80lX
0GzhPwf/Yr3e8y170nPtPoDvXjhBDBnvKFM2VpCdOuYx1kYXAYH5o6FayM2oyheh
gShDCt/+Davsc5wd0Vd9t82lrxZCIvDWnAmEtznnot8h59icP53bgWXA+u/YWxcO
ZOrTkF28/EvxYvskh6OWJHEqFmYLhCg+EagB7tYbkBq4VrFP/gOhSTh+/q//8oAj
vKGJuLvAQxQthjQHBW6pXMpvHMWjg6YYN+RZPCzCrPeCcHP4olbgjkoUtvJffvju
TQjb0arsdRP+UxkR0sydeJxU+Mcm0zBRMB+9TzBmtjMMHvcMpMhJ1PkUUDnh9+Sk
Gmit9AinQTYOprDON7DvQW00bX62Fw==
=mF5X
-----END PGP SIGNATURE-----

--Sig_/7GsqgIcHxyht7J.Uk0ahOQ/--