linux-kernel - Re: linux-next: manual merge of the vfs-brauner tree with the erofs-fixes 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: <b7332fb7-4c49-3af2-7095-e728a6af8ff7@huaweicloud.com>
Date: Wed, 24 Apr 2024 09:26:30 +0800
From: Baokun Li <libaokun@...weicloud.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Gao Xiang <xiang@...nel.org>, Christian Brauner <brauner@...nel.org>,
 Gao Xiang <hsiangkao@...ux.alibaba.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 libaokun@...weicloud.com
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the
 erofs-fixes tree

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