Subject: linux-next: manual merge of the integrity tree with the security tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 21 Aug 2019 13:27:57 +1000

Hi all,

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

  arch/s390/kernel/machine_kexec_file.c

between commit:

  99d5cadfde2b ("kexec_file: split KEXEC_VERIFY_SIG into KEXEC_SIG and KEXEC_SIG_FORCE")

from the security tree and commit:

  c8424e776b09 ("MODSIGN: Export module signature definitions")

from the integrity 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 arch/s390/kernel/machine_kexec_file.c
index c0f33ba49a9a,1ac9fbc6e01e..000000000000
--- a/arch/s390/kernel/machine_kexec_file.c
+++ b/arch/s390/kernel/machine_kexec_file.c
@@@ -22,29 -22,7 +22,7 @@@ const struct kexec_file_ops * const kex
  	NULL,
  };
  
 -#ifdef CONFIG_KEXEC_VERIFY_SIG
 +#ifdef CONFIG_KEXEC_SIG
- /*
-  * Module signature information block.
-  *
-  * The constituents of the signature section are, in order:
-  *
-  *	- Signer's name
-  *	- Key identifier
-  *	- Signature data
-  *	- Information block
-  */
- struct module_signature {
- 	u8	algo;		/* Public-key crypto algorithm [0] */
- 	u8	hash;		/* Digest algorithm [0] */
- 	u8	id_type;	/* Key identifier type [PKEY_ID_PKCS7] */
- 	u8	signer_len;	/* Length of signer's name [0] */
- 	u8	key_id_len;	/* Length of key identifier [0] */
- 	u8	__pad[3];
- 	__be32	sig_len;	/* Length of signature data */
- };
- 
- #define PKEY_ID_PKCS7 2
- 
  int s390_verify_sig(const char *kernel, unsigned long kernel_len)
  {
  	const unsigned long marker_len = sizeof(MODULE_SIG_STRING) - 1;