From: Gao Xiang <hsiangkao@linux.alibaba.com>
To: Mark Brown <broonie@kernel.org>
Cc: Gao Xiang <xiang@kernel.org>,
Christian Brauner <brauner@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 erofs tree with the vfs-idmapping tree
Date: Fri, 14 Apr 2023 00:27:28 +0800 [thread overview]
Message-ID: <c52808f1-0f4d-9bc3-9faa-0e262d28dac1@linux.alibaba.com> (raw)
In-Reply-To: <664140af-3d95-416c-8f89-cad7beeaac19@sirena.org.uk>
On 2023/4/14 00:23, Mark Brown wrote:
> On Fri, Apr 14, 2023 at 12:16:46AM +0800, Gao Xiang wrote:
>
>> Thanks. Actually I didn't update the corresponind xattr patches (just
>> rebase some older commits, also I'd like to avoid in the future, but
>> sometimes it's impossible at least if some RVB is added...)
>
>> I think it could be resolved as before by Stephen:
>> https://lore.kernel.org/r/20230412101942.75e3efa9@canb.auug.org.au
>
>> And which looks the same as below:
>
> Probably some context changed which caused me to have to reresolve the
> conflict? Or perhaps just rerere not syncing properly from Stephen's
> work.
Not sure.. I didn't change the file itself.
Anyway, thanks for the efforts and time!
Thanks,
Gao Xiang
next prev parent reply other threads:[~2023-04-13 16:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 14:46 linux-next: manual merge of the erofs tree with the vfs-idmapping tree broonie
2023-04-13 15:49 ` Mark Brown
2023-04-13 16:16 ` Gao Xiang
2023-04-13 16:23 ` Mark Brown
2023-04-13 16:27 ` Gao Xiang [this message]
2023-04-20 9:36 ` Christian Brauner
-- strict thread matches above, loose matches on Subject: below --
2023-04-12 0:19 Stephen Rothwell
2023-04-12 2:01 ` Gao Xiang
2023-04-12 2:35 ` Jingbo Xu
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=c52808f1-0f4d-9bc3-9faa-0e262d28dac1@linux.alibaba.com \
--to=hsiangkao@linux.alibaba.com \
--cc=brauner@kernel.org \
--cc=broonie@kernel.org \
--cc=jefflexu@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).