All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Masahiro Yamada <yamada.masahiro@socionext.com>,
	Jessica Yu <jeyu@kernel.org>,
	Thiago Jung Bauermann <bauerman@linux.ibm.com>,
	Philipp Rudo <prudo@linux.ibm.com>,
	Mimi Zohar <zohar@linux.vnet.ibm.com>,
	Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the integrity tree with the modules tree
Date: Tue, 24 Sep 2019 10:42:10 -0700	[thread overview]
Message-ID: <20190924174210.GZ2036@sirena.org.uk> (raw)

[-- 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 --]

                 reply	other threads:[~2019-09-24 17:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190924174210.GZ2036@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=bauerman@linux.ibm.com \
    --cc=dmitry.kasatkin@gmail.com \
    --cc=jeyu@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=prudo@linux.ibm.com \
    --cc=yamada.masahiro@socionext.com \
    --cc=zohar@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.