Conflict with Mickaël Salaün's blacklist patches [was [PATCH v5 0/4] Add EFI_CERT_X509_GUID support for dbx/mokx entries]

David Howells
2021-02-03T16:28:40Z

Eric Snowberg <eric.snowberg@oracle.com> wrote:

> This is the fifth patch series for adding support for
> EFI_CERT_X509_GUID entries [1]. It has been expanded to not only include
> dbx entries but also entries in the mokx. Additionally my series to
> preload these certificate [2] has also been included.

Okay, I've tentatively applied this to my keys-next branch. However, it
conflicts minorly with Mickaël Salaün's patches that I've previously merged on
the same branch. Can you have a look at the merge commit

https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/commit/?h=keys-next&id=fdbbe7ceeb95090d09c33ce0497e0394c82aa33d

(the top patch of my keys-next branch)

to see if that is okay by both of you? If so, can you give it a whirl?

Thanks,
David