From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Herbert Xu <herbert@gondor•apana.org.au>,
Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Harald Freudenberger <freude@linux•vnet.ibm.com>,
Sean Wang <sean.wang@mediatek•com>
Subject: linux-next: manual merge of the crypto tree with the s390 tree
Date: Thu, 27 Apr 2017 10:50:54 +1000 [thread overview]
Message-ID: <20170427105054.65dff661@canb.auug.org.au> (raw)
Hi Herbert,
Today's linux-next merge of the crypto tree got conflicts in:
drivers/char/hw_random/Makefile
drivers/char/hw_random/Kconfig
between commit:
bbcb478e3fef ("s390/trng: Introduce s390 TRNG device driver.")
from the s390 tree and commit:
7701d1ff8ed1 ("hwrng: mtk - Add driver for hardware random generator on MT7623 SoC")
from the crypto 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 drivers/char/hw_random/Kconfig
index b9918fb9587d,fd34121934e5..000000000000
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -423,20 -409,20 +409,34 @@@ config HW_RANDOM_CAVIU
If unsure, say Y.
+config HW_RANDOM_S390
+ tristate "S390 True Random Number Generator support"
+ depends on S390
+ default HW_RANDOM
+ ---help---
+ This driver provides kernel-side support for the True
+ Random Number Generator available as CPACF extension
+ on modern s390 hardware platforms.
+
+ To compile this driver as a module, choose M here: the
+ module will be called s390-trng.
+
+ If unsure, say Y.
+
+ config HW_RANDOM_MTK
+ tristate "Mediatek Random Number Generator support"
+ depends on HW_RANDOM
+ depends on ARCH_MEDIATEK || COMPILE_TEST
+ default y
+ ---help---
+ This driver provides kernel-side support for the Random Number
+ Generator hardware found on Mediatek SoCs.
+
+ To compile this driver as a module, choose M here. the
+ module will be called mtk-rng.
+
+ If unsure, say Y.
+
endif # HW_RANDOM
config UML_RANDOM
diff --cc drivers/char/hw_random/Makefile
index dd1765246255,de6ea808bd3c..000000000000
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@@ -36,4 -35,4 +35,5 @@@ obj-$(CONFIG_HW_RANDOM_STM32) += stm32-
obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o
obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o
obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o
+obj-$(CONFIG_HW_RANDOM_S390) += s390-trng.o
+ obj-$(CONFIG_HW_RANDOM_MTK) += mtk-rng.o
next reply other threads:[~2017-04-27 0:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-27 0:50 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-09-15 21:02 linux-next: manual merge of the crypto tree with the s390 tree 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=20170427105054.65dff661@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=freude@linux$(echo .)vnet.ibm.com \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=sean.wang@mediatek$(echo .)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