From: "Mickaël Salaün" <mic@digikod.net>
To: David Howells <dhowells@redhat.com>, Jarkko Sakkinen <jarkko@kernel.org>
Cc: "David Woodhouse" <dwmw2@infradead.org>,
"David S . Miller" <davem@davemloft.net>,
"Herbert Xu" <herbert@gondor.apana.org.au>,
"James Morris" <jmorris@namei.org>,
"Mickaël Salaün" <mic@linux.microsoft.com>,
"Mimi Zohar" <zohar@linux.ibm.com>,
"Serge E . Hallyn" <serge@hallyn.com>,
"Tyler Hicks" <tyhicks@linux.microsoft.com>,
keyrings@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org
Subject: Re: [PATCH v4 00/10] Enable root to update the blacklist keyring
Date: Thu, 28 Jan 2021 19:00:33 +0100 [thread overview]
Message-ID: <09376843-a55f-476a-7073-91aacc9ebdc8@digikod.net> (raw)
In-Reply-To: <03ddd243-db25-a054-489d-e64ead4d6f59@digikod.net>
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
>>
next prev parent reply other threads:[~2021-01-28 18:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 15:55 [PATCH v4 00/10] Enable root to update the blacklist keyring Mickaël Salaün
2021-01-21 15:55 ` [PATCH v4 01/10] tools/certs: Add print-cert-tbs-hash.sh Mickaël Salaün
2021-01-21 15:55 ` [PATCH v4 02/10] certs: Check that builtin blacklist hashes are valid Mickaël Salaün
2021-01-21 15:55 ` [PATCH v4 03/10] certs: Fix blacklisted hexadecimal hash string check Mickaël Salaün
2021-01-21 15:55 ` [PATCH v4 04/10] certs: Fix blacklist flag type confusion Mickaël Salaün
2021-01-21 15:55 ` [PATCH v4 05/10] certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID Mickaël Salaün
2021-01-21 15:55 ` [PATCH v4 06/10] certs: Make blacklist_vet_description() more strict Mickaël Salaün
2021-01-21 15:55 ` [PATCH v4 07/10] certs/blacklist: fix kernel doc interface issue Mickaël Salaün
2021-01-21 15:55 ` [PATCH v4 08/10] certs: Factor out the blacklist hash creation Mickaël Salaün
2021-01-21 15:55 ` [PATCH v4 09/10] PKCS#7: Fix missing include Mickaël Salaün
2021-01-21 15:55 ` [PATCH v4 10/10] certs: Allow root user to append signed hashes to the blacklist keyring Mickaël Salaün
2021-01-28 16:52 ` [PATCH v4 00/10] Enable root to update " David Howells
2021-01-28 17:38 ` Mickaël Salaün
2021-01-28 18:00 ` Mickaël Salaün [this message]
2021-01-30 19:39 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=09376843-a55f-476a-7073-91aacc9ebdc8@digikod.net \
--to=mic@digikod.net \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=herbert@gondor.apana.org.au \
--cc=jarkko@kernel.org \
--cc=jmorris@namei.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mic@linux.microsoft.com \
--cc=serge@hallyn.com \
--cc=tyhicks@linux.microsoft.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).