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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <734e4630-15b5-112b-9d67-89f5cb60018b@linux.alibaba.com>
Date:   Wed, 12 Apr 2023 10:01:59 +0800
From:   Gao Xiang <hsiangkao@...ux.alibaba.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Gao Xiang <xiang@...nel.org>,
        Christian Brauner <christian@...uner.io>,
        Seth Forshee <sforshee@...nel.org>,
        Jingbo Xu <jefflexu@...ux.alibaba.com>
Cc:     "Christian Brauner (Microsoft)" <brauner@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the erofs tree with the vfs-idmapping
 tree



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