Subject: Re: linux-next: manual merge of the erofs tree with the vfs-idmapping tree

From: Jingbo Xu <[email-masked]>
Date: Wed, 12 Apr 2023 10:35:19 +0800

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/[email-masked]/

-- 
Thanks,
Jingbo