linux-next: manual merge of the tpmdd tree with the kbuild tree

linux-next: manual merge of the tpmdd tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 722 bytes --]

Hi all,

Today's linux-next merge of the tpmdd tree got a conflict in:

  include/Kbuild

between commit:

  fcbb8461fd23 ("kbuild: remove header compile test")

from the kbuild tree and commit:

  47f9c2796891 ("KEYS: trusted: Create trusted keys subsystem")

from the tpmdd tree.

I fixed it up (I just removed the file) 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the tpmdd tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 915 bytes --]

Hi all,

On Mon, 18 Nov 2019 12:39:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tpmdd tree got a conflict in:
> 
>   include/Kbuild
> 
> between commit:
> 
>   fcbb8461fd23 ("kbuild: remove header compile test")
> 
> from the kbuild tree and commit:
> 
>   47f9c2796891 ("KEYS: trusted: Create trusted keys subsystem")
> 
> from the tpmdd tree.
> 
> I fixed it up (I just removed the file) 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.

This is now a conflict between the kbuild tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the tpmdd tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3378 bytes --]

Hi all,

Today's linux-next merge of the tpmdd tree got a conflict in:

  certs/Makefile

between commits:

  33c1957574b6 ("kbuild: do not quote string values in include/config/auto.conf")
  41f431290557 ("certs: refactor file cleaning")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc certs/Makefile
index f7041c29a2e0,e38e10c46890..000000000000
--- a/certs/Makefile
+++ b/certs/Makefile
@@@ -6,21 -6,46 +6,36 @@@
  obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o
  obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o
  obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o
 -ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),"")
 +ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),)
+ 
+ quiet_cmd_check_blacklist_hashes = CHECK   $(patsubst "%",%,$(2))
+       cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@
+ 
+ $(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST))
+ 
+ $(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked
+ 
+ CFLAGS_blacklist_hashes.o += -I$(srctree)
+ 
 -targets += blacklist_hashes_checked
+ $(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE
+ 	$(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST))
+ 
  obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
+ 
  else
  obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
  endif
++targets += blacklist_hashes_checked
  
 -ifeq ($(CONFIG_SYSTEM_TRUSTED_KEYRING),y)
 -
 -$(eval $(call config_filename,SYSTEM_TRUSTED_KEYS))
 +quiet_cmd_extract_certs  = CERT    $@
 +      cmd_extract_certs  = $(obj)/extract-cert $(2) $@
  
 -# GCC doesn't include .incbin files in -MD generated dependencies (PR#66871)
  $(obj)/system_certificates.o: $(obj)/x509_certificate_list
  
 -# Cope with signing_key.x509 existing in $(srctree) not $(objtree)
 -AFLAGS_system_certificates.o := -I$(srctree)
 -
 -quiet_cmd_extract_certs  = EXTRACT_CERTS   $(patsubst "%",%,$(2))
 -      cmd_extract_certs  = scripts/extract-cert $(2) $@
 +$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE
 +	$(call if_changed,extract_certs,$(if $(CONFIG_SYSTEM_TRUSTED_KEYS),$<,""))
  
  targets += x509_certificate_list
 -$(obj)/x509_certificate_list: scripts/extract-cert $(SYSTEM_TRUSTED_KEYS_SRCPREFIX)$(SYSTEM_TRUSTED_KEYS_FILENAME) FORCE
 -	$(call if_changed,extract_certs,$(SYSTEM_TRUSTED_KEYS_SRCPREFIX)$(CONFIG_SYSTEM_TRUSTED_KEYS))
 -endif # CONFIG_SYSTEM_TRUSTED_KEYRING
 -
 -clean-files := x509_certificate_list .x509.list x509_revocation_list blacklist_hashes_checked
  
  ifeq ($(CONFIG_MODULE_SIG),y)
  	SIGN_KEY = y

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the tpmdd tree with the kbuild tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index d38fd8f77cbc,f8188efa3854..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4445,7 -4410,10 +4445,9 @@@ L:	keyrings@vger.kernel.or
  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 <ojeda@kernel.org>
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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]