linux-kernel - Re: [PATCH v4 00/10] Enable root to update the blacklist keyring

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]

Date:   Thu, 28 Jan 2021 19:00:33 +0100
From:   Mickaël Salaün <mic@...ikod.net>
To:     David Howells <dhowells@...hat.com>,
        Jarkko Sakkinen <jarkko@...nel.org>
Cc:     David Woodhouse <dwmw2@...radead.org>,
        "David S . Miller" <davem@...emloft.net>,
        Herbert Xu <herbert@...dor.apana.org.au>,
        James Morris <jmorris@...ei.org>,
        Mickaël Salaün <mic@...ux.microsoft.com>,
        Mimi Zohar <zohar@...ux.ibm.com>,
        "Serge E . Hallyn" <serge@...lyn.com>,
        Tyler Hicks <tyhicks@...ux.microsoft.com>,
        keyrings@...r.kernel.org, linux-crypto@...r.kernel.org,
        linux-integrity@...r.kernel.org, linux-kernel@...r.kernel.org,
        linux-security-module@...r.kernel.org
Subject: Re: [PATCH v4 00/10] Enable root to update the blacklist keyring

I noticed that commits in your branch are not up to date with latest
Jarkoo reviews on my patches (see changes since v2). There is no
conflict if you replace conflicting patches from your branch by patches
from this series. Could you replace your duplicate commits with this
patch series?


On 28/01/2021 18:38, Mickaël Salaün wrote:
> 
> 
> On 28/01/2021 17:52, David Howells wrote:
>>
>> Hi Mickaël,
> Hi David,
> 
>>
>> I could pull your patches (unless Jarkko wants to), but can you please drop
>> the patches that are also in my keys-misc branch lest one or other (or both)
>> of our branches get dropped in the next merge window due to conflicts?
>>
>> Ideally, can you base your branch on my keys-misc branch?
> 
> Sure, I'm rebasing and testing a new patch series.
> 
>>
>> Thanks,
>> David
>>