Messages in this thread |  | | Subject | Re: Conflict with Mickaël Salaün's blacklis t patches [was [PATCH v5 0/4] Add EFI CERT X509 GUID support for dbx/mokx entries] | From | Mickaël Salaün <> | Date | Tue, 9 Feb 2021 14:59:14 +0100 |
| |
Hi David,
The only commit causing issues is commit f78e50c8f750 ("certs: Factor out the blacklist hash creation"). I think my last patch fix the issue, and I'm testing with the UEFI DBX, but I don't understand why this change would have an impact. In the meantime you can push Eric's commits first, I'll adapt my changes.
Mickaël
On 09/02/2021 14:14, David Howells wrote: > > Hi Eric, Mickaël, > > Do we have a consensus on this? From what's written here, I don't think I can > ask Linus to pull the merge of your two branches. I feel that I probably need > to push Eric's first as that fixes a CVE if I can't offer a merge. > > David >
|  |