From: Jingbo Xu <jefflexu@linux.alibaba.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Gao Xiang <hsiangkao@linux.alibaba.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Al Viro <viro@ZenIV.linux.org.uk>
Subject: Re: linux-next: manual merge of the vfs tree with the erofs tree
Date: Mon, 28 Nov 2022 10:12:36 +0800 [thread overview]
Message-ID: <863d66e8-e6d3-d266-7660-a64e54330bdd@linux.alibaba.com> (raw)
In-Reply-To: <20221128091323.246f8ce1@canb.auug.org.au>
On 11/28/22 6:13 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/erofs/fscache.c
>
> between commit:
>
> 313e9413d512 ("erofs: switch to prepare_ondemand_read() in fscache mode")
>
> from the erofs tree and commit:
>
> de4eda9de2d9 ("use less confusing names for iov_iter direction initializers")
>
> from the vfs 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.
>
It looks good to me. Thanks.
--
Thanks,
Jingbo
next prev parent reply other threads:[~2022-11-28 2:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-27 22:13 Stephen Rothwell
2022-11-28 2:12 ` Jingbo Xu [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-04 22:24 Stephen Rothwell
2022-12-05 3:13 ` Gao Xiang
2022-12-05 4:11 ` Stephen Rothwell
2022-12-05 4:43 ` Gao Xiang
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=863d66e8-e6d3-d266-7660-a64e54330bdd@linux.alibaba.com \
--to=jefflexu@linux.alibaba.com \
--cc=hsiangkao@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome