Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <67aed69a-b28a-587b-b88b-3d8ffc88e767@linux.alibaba.com>
Date:   Wed, 12 Apr 2023 10:35:19 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.6.1
Subject: Re: linux-next: manual merge of the erofs tree with the vfs-idmapping
 tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Gao Xiang <xiang@kernel.org>,
        Christian Brauner <christian@brauner.io>,
        Seth Forshee <sforshee@kernel.org>
Cc:     "Christian Brauner (Microsoft)" <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>
References: <20230412101942.75e3efa9@canb.auug.org.au>
From:   Jingbo Xu <jefflexu@linux.alibaba.com>
In-Reply-To: <20230412101942.75e3efa9@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 4/12/23 8:19 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the erofs tree got a conflict in:
> 
>   fs/erofs/xattr.c
> 
> between commit:
> 
>   a5488f29835c ("fs: simplify ->listxattr() implementation")
> 
> from the vfs-idmapping tree and commit:
> 
>   3f43a25918ac ("erofs: handle long xattr name prefixes properly")
> 
> from the erofs 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.
> 

Hi,

Thanks for the fix up. It looks good to me.

It passes the corresponding testcase [1].

[1]
https://lore.kernel.org/all/20230411103004.104064-1-jefflexu@linux.alibaba.com/

-- 
Thanks,
Jingbo