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, 5 Dec 2022 15:11:07 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Gao Xiang <hsiangkao@linux.alibaba.com>
Cc:     Al Viro <viro@ZenIV.linux.org.uk>, Gao Xiang <xiang@kernel.org>,
        Jingbo Xu <jefflexu@linux.alibaba.com>,
        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 vfs tree with the erofs tree
Message-ID: <20221205151107.05579d52@canb.auug.org.au>
In-Reply-To: <Y41h7hz12QXQaSYS@B-P7TQMD6M-0146.local>
References: <20221205092415.56cc6e19@canb.auug.org.au>
        <Y41h7hz12QXQaSYS@B-P7TQMD6M-0146.local>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/BSu3Op1WMDlbMXA2a781hFT";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi Gao,

On Mon, 5 Dec 2022 11:13:50 +0800 Gao Xiang <hsiangkao@linux.alibaba.com> w=
rote:
>
> On Mon, Dec 05, 2022 at 09:24:15AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >=20
> > Today's linux-next merge of the vfs tree got a conflict in:
> >=20
> >   fs/erofs/fscache.c
> >=20
> > between commits:
> >=20
> >   89175ef1262d ("erofs: switch to prepare_ondemand_read() in fscache mo=
de")
> >   89175ef1262d ("erofs: switch to prepare_ondemand_read() in fscache mo=
de")
> >=20
> > from the erofs tree and commit:
> >=20
> >   89175ef1262d ("erofs: switch to prepare_ondemand_read() in fscache mo=
de")
> >=20
> > from the vfs tree. =20
>=20
> Is the commit from the vfs tree correct?
>=20
> The conflict fix looks good to me (we tend to enable large folios in the
> next cycle.)

The commits should be

  89175ef1262d ("erofs: switch to prepare_ondemand_read() in fscache mode")
  a21274e993a6 ("erofs: support large folios for fscache mode")

from the erofs tree and

  de4eda9de2d9 ("use less confusing names for iov_iter direction initialize=
rs")

from the vfs tree.

Cut and paste weirdness caught me again :-(

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmONb1sACgkQAVBC80lX
0GzOFggAlwu3mKOVKfVFh8bKoRysoRJ2X/daFw/Jg4c4YevaFil52yuJ1wmxO5XD
yK+qtZagnmU19mS5PidFZwN0/XOi5MzF3kuxsNiG2Ni9XGOk6hgM8Lv9qykqB/uc
uKvieUhUj8j3FL0tgM1+ayBg+5M8dMwum5OgtTYIv3JNaridWHNhtXUNsgHBWzdc
kql81SPZS39x66Wwi6HolCAmkd859YBpsx81dA7zUYGXoPqsDRefLE1w3bGjH0a3
VGzIfGpuBdlx5cbr2An22GhkV+4AAGQdsMemq2tg1L+feA9EUfJoaXXVys3vLQl7
h6t3jBP5iahQHeVlDsE1aY9exxPGlw==
=RN8q
-----END PGP SIGNATURE-----

--Sig_/BSu3Op1WMDlbMXA2a781hFT--