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
Date: Mon, 5 Dec 2022 15:11:07 +1100 [thread overview]
Message-ID: <20221205151107.05579d52@canb.auug.org.au> (raw)
In-Reply-To: <Y41h7hz12QXQaSYS@B-P7TQMD6M-0146.local>
[-- Attachment #1: Type: text/plain, Size: 1165 bytes --]
Hi Gao,
On Mon, 5 Dec 2022 11:13:50 +0800 Gao Xiang <hsiangkao@linux.alibaba.com> wrote:
>
> On Mon, Dec 05, 2022 at 09:24:15AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the vfs tree got a conflict in:
> >
> > fs/erofs/fscache.c
> >
> > between commits:
> >
> > 89175ef1262d ("erofs: switch to prepare_ondemand_read() in fscache mode")
> > 89175ef1262d ("erofs: switch to prepare_ondemand_read() in fscache mode")
> >
> > from the erofs tree and commit:
> >
> > 89175ef1262d ("erofs: switch to prepare_ondemand_read() in fscache mode")
> >
> > from the vfs tree.
>
> Is the commit from the vfs tree correct?
>
> 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 initializers")
from the vfs tree.
Cut and paste weirdness caught me again :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-12-05 4:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-04 22:24 linux-next: manual merge of the vfs tree with the erofs tree Stephen Rothwell
2022-12-05 3:13 ` Gao Xiang
2022-12-05 4:11 ` Stephen Rothwell [this message]
2022-12-05 4:43 ` Gao Xiang
-- strict thread matches above, loose matches on Subject: below --
2022-11-27 22:13 Stephen Rothwell
2022-11-28 2:12 ` Jingbo Xu
2020-05-29 1:45 Stephen Rothwell
2020-05-29 1:51 ` Al Viro
2020-05-29 3:40 ` Gao Xiang
2020-05-29 14:36 ` Al Viro
2020-05-29 14:50 ` Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221205151107.05579d52@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hsiangkao@linux.alibaba.com \
--cc=jefflexu@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
--cc=xiang@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.