linux-next: manual merge of the integrity tree with the modules tree

linux-next: manual merge of the integrity tree with the modules tree

[Mark Brown]

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

Hi all,

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

  init/Kconfig

between commit:

  d189c2a4b6f0f4a ("module: remove redundant 'depends on MODULES'")

from the modules tree and commit:

  c8424e776b09328 ("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.

diff --cc init/Kconfig
index 70734141a2f5a,2dca877c9ed71..0000000000000
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -2047,7 -2010,8 +2051,7 @@@ config MODULE_SRCVERSION_AL
  
  config MODULE_SIG
  	bool "Module signature verification"
- 	select SYSTEM_DATA_VERIFICATION
 -	depends on MODULES
+ 	select MODULE_SIG_FORMAT
  	help
  	  Check modules for valid signatures upon load: the signature
  	  is simply appended to the module. For more information see

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