From: Gao Xiang <hsiangkao@linux.alibaba.com>
To: Christian Brauner <brauner@kernel.org>
Cc: Baokun Li <libaokun@huaweicloud.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Gao Xiang <xiang@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 vfs-brauner tree with the erofs-fixes tree
Date: Thu, 25 Apr 2024 09:55:14 +0800 [thread overview]
Message-ID: <d9cac14f-d8e3-4620-ba05-95c3ae689b21@linux.alibaba.com> (raw)
In-Reply-To: <20240424-enklave-umgezogen-93524415ee92@brauner>
On 2024/4/24 20:51, Christian Brauner wrote:
> On Wed, Apr 24, 2024 at 10:13:43AM +0800, Gao Xiang wrote:
>> Hi Stephen,
>>
>> On 2024/4/24 09:26, Baokun Li wrote:
>>> Hi Stephen,
>>>
>>> On 2024/4/24 8:24, Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>>>>
>>>> fs/erofs/super.c
>>>>
>>>> between commits:
>>>>
>>>> ab1bbc1735ff ("erofs: get rid of erofs_fs_context")
>>>> 569a48fed355 ("erofs: reliably distinguish block based and fscache mode")
>>>>
>>>> from the erofs-fixes tree and commit:
>>>>
>>>> e4f586a41748 ("erofs: reliably distinguish block based and fscache mode")
>>>>
>>>> from the vfs-brauner tree.
>>>>
>>>> I fixed it up (I think - I used the former version) 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.
>>>>
>>> Christian previously mentioned that the fix from the vfs-brauner tree
>>> was an accident:
>>>
>>> "An an accident on my part as I left it in the vfs.fixes branch."
>>>
>>> So the two commits from the erofs-fixes tree are the final fixes.
>>>
>>> I'm very sorry for any inconvenience caused.
>>
>> Yeah, Christian was picked this fix by accident as mentioned in,
>> https://lore.kernel.org/r/20240419-tundra-komodowaran-5c3758d496e4@brauner
>>
>> I guest that was due to his local work at that time since the
>> original idea to fix this issue was from him (thanks again!).
>
> Yeah, sorry about that. I dropped it a few days ago but was on the road
> for a bit. I'll push a new version by eod.
Yeah, sounds good, thanks :-)
Thanks,
Gao Xiang
prev parent reply other threads:[~2024-04-25 1:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 0:24 linux-next: manual merge of the vfs-brauner tree with the erofs-fixes tree Stephen Rothwell
2024-04-24 1:26 ` Baokun Li
2024-04-24 2:13 ` Gao Xiang
2024-04-24 12:51 ` Christian Brauner
2024-04-25 1:55 ` Gao Xiang [this message]
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=d9cac14f-d8e3-4620-ba05-95c3ae689b21@linux.alibaba.com \
--to=hsiangkao@linux.alibaba.com \
--cc=brauner@kernel.org \
--cc=libaokun@huaweicloud.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).