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

2021-01-30 Thread Jarkko Sakkinen
On Thu, 2021-01-28 at 16:52 +, David Howells wrote: > > Hi Mickaël, > > 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 conf

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

2021-01-28 Thread Mickaël Salaün
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

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

2021-01-28 Thread Mickaël Salaün
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 conf

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

2021-01-28 Thread David Howells
Hi Mickaël, 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?

[PATCH v4 00/10] Enable root to update the blacklist keyring

2021-01-21 Thread Mickaël Salaün
This fourth patch series mainly reorder patches and add more documentation as requested by Jarkko. This series is based on v5.11-rc4. The goal of these patches is to add a new configuration option to enable the root user to load signed keys in the blacklist keyring. This keyring is useful to "un