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

[Gao Xiang]

On 2023/4/12 08:19, 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.

Thanks, it looks good to me. Also hopefully Jingbo
could test the merged patch as well.

Thanks,
Gao Xiang