linux-next: manual merge of the tpmdd tree with the kbuild tree
Hi all,
Today's linux-next merge of the tpmdd tree got a conflict in:
MAINTAINERS
certs/.gitignore
between commit:
98bb79d61f0c ("certs: move scripts/extract-cert to certs/")
from the kbuild tree and commit:
0fde37e9c004 ("certs: Check that builtin blacklist hashes are valid")
from the tpmdd tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
Signature · 28 lines
Cheers, Stephen Rothwell diff --cc MAINTAINERS index d38fd8f77cbc,f8188efa3854..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -4445,7 -4410,10 +4445,9 @@@ L: [email protected] S: Maintained F: Documentation/admin-guide/module-signing.rst F: certs/ + F: scripts/check-blacklist-hashes.awk -F: scripts/extract-cert.c F: scripts/sign-file.c + F: tools/certs/ CFAG12864B LCD DRIVER M: Miguel Ojeda <[email protected]> diff --cc certs/.gitignore index 9e42fe3e02f5,01de9442e4e2..000000000000 --- a/certs/.gitignore +++ b/certs/.gitignore @@@ -1,4 -1,4 +1,5 @@@ # SPDX-License-Identifier: GPL-2.0-only + /blacklist_hashes_checked +/extract-cert /x509_certificate_list /x509_revocation_list