From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kees Cook <keescook@google•com>,
Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Laura Abbott <labbott@redhat•com>
Subject: linux-next: manual merge of the kspp tree with the s390 tree
Date: Wed, 8 Feb 2017 12:37:03 +1100 [thread overview]
Message-ID: <20170208123703.6165fbce@canb.auug.org.au> (raw)
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
arch/s390/Kconfig.debug
between commit:
89175cf76686 ("s390: provide sclp based boot console")
from the s390 tree and commit:
ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common")
from the kspp 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/Kconfig.debug
index 32b3e3bfd022,57f8ea9c49e3..000000000000
--- a/arch/s390/Kconfig.debug
+++ b/arch/s390/Kconfig.debug
@@@ -17,11 -17,4 +17,7 @@@ config S390_PTDUM
kernel.
If in doubt, say "N"
- config DEBUG_SET_MODULE_RONX
- def_bool y
- depends on MODULES
-
+config EARLY_PRINTK
+ def_bool y
+
endmenu
next reply other threads:[~2017-02-08 1:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 1:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-26 7:44 linux-next: manual merge of the kspp tree with the s390 tree Stephen Rothwell
2025-09-25 14:39 Mark Brown
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=20170208123703.6165fbce@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=keescook@google$(echo .)com \
--cc=labbott@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schwidefsky@de$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox