linux-kernel - Re: linux-next: manual merge of the nolibc tree with the vfs-brauner 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] [day] [month] [year] [list]

Message-ID: <b7105474-bec9-f08b-b623-bf350909cab5@linuxfoundation.org>
Date:   Thu, 24 Aug 2023 08:24:32 -0600
From:   Shuah Khan <skhan@...uxfoundation.org>
To:     Christian Brauner <brauner@...nel.org>,
        Thomas Weißschuh <thomas@...ch.de>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>, Willy Tarreau <w@....eu>,
        "Paul E. McKenney" <paulmck@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Zhangjin Wu <falcon@...ylab.org>,
        Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: linux-next: manual merge of the nolibc tree with the vfs-brauner
 tree

On 8/24/23 02:52, Christian Brauner wrote:
>> Anyways Linus should also be able to resolve the conflict for v6.6 with
>> a small hint in the PR.
> 
> Suprisingly, we've done this before. :)

Right. This is how resolve these types of merge conflicts. I will add
note to Linus about this one.

thanks,
-- Shuah