Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 18 Jul 2022 12:59:32 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Al Viro <viro@zeniv.linux.org.uk>
Cc:     Jens Axboe <axboe@kernel.dk>, Keith Busch <kbusch@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the vfs tree
Message-ID: <20220718125932.1ab89122@canb.auug.org.au>
In-Reply-To: <YtC9AgqezKXuUoy6@ZenIV>
References: <20220714120840.1e1f8c63@canb.auug.org.au>
        <0904ae71-972f-f183-f295-bce3b8518fcf@kernel.dk>
        <YtC6SUmyaCSKe2HX@ZenIV>
        <YtC9AgqezKXuUoy6@ZenIV>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/c3OrDG6utUWNfF7eydkpohV";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi Al,

On Fri, 15 Jul 2022 02:04:02 +0100 Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> On Fri, Jul 15, 2022 at 01:52:25AM +0100, Al Viro wrote:
>=20
> > Ones from Keith's branch - #alignment-fixes-rebased in there.  Looks li=
ke
> > one of the commits in it got changed since then - the difference in
> > __bio_iov_iter_get_pages() (unsigned int i initialization).
> >=20
> > Sigh...  I'll rebase on top of that. =20
>=20
> Rebased and pushed out (with copy_pipe_to_iter() fix folded in as well)

BTW, these still cause a conflict.  As long as you are sharing patches
(and then adding changes to the same areas), there will be conflicts.
You need to share commits i.e. a shared branch.

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLUzJQACgkQAVBC80lX
0GwltAgAlbfgnNkfoM9Zq4GFya0yXAGAQhfJVDrrymIwCL7wiMLa3B2iEosBQD5z
NIi/4zipJUQEkRi5AGDu8xfdFaqy0J/bADsfjg18yU0m32Jj3dEac3HMSziGVJFV
TRuwErpOoVpo9wIyaPNMtWX1w8KXXREQixJY5UDl3Y4wegDhNEW24tbHuISQasJG
pRU2c0XLW8sjw0QW2FsQYfdh3SkyTeX1z8l6wgsJfu87R+0Z3iiLVpJXrh9lU55c
tooTMXKIFijHeIa7WhoeE0+PNL5czM33W1NJiOtng350A3txbBDqnavVF5zL1l9+
eZ8g2WjOQV/K3wz4YOFA0A1wfISDcw==
=znXe
-----END PGP SIGNATURE-----

--Sig_/c3OrDG6utUWNfF7eydkpohV--