Received-SPF: pass (google.com: domain of linux-kernel+bounces-156091-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <b7332fb7-4c49-3af2-7095-e728a6af8ff7@huaweicloud.com>
Date: Wed, 24 Apr 2024 09:26:30 +0800
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.1.2
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the
 erofs-fixes tree
Content-Language: en-US
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Gao Xiang <xiang@kernel.org>, Christian Brauner <brauner@kernel.org>,
 Gao Xiang <hsiangkao@linux.alibaba.com>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>,
 libaokun@huaweicloud.com
References: <20240424102445.53ba5ba2@canb.auug.org.au>
From: Baokun Li <libaokun@huaweicloud.com>
In-Reply-To: <20240424102445.53ba5ba2@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

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.

Thanks,
Baokun