linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
drivers/char/hw_random/Kconfig between commit 2257ffbca73c ("hwrng: msm:
switch Kconfig to ARCH_QCOM depends") from Linus' tree and commits
020016183453 ("hwrng: Turn HW_RANDOM into a menuconfig") and 2d9cab5194c8
("hwrng: Fix a few driver dependencies and defaults") from the crypto
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/char/hw_random/Kconfig
index 244759bbd7b7,38cfae686cc4..000000000000
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -342,11 -321,12 +321,12 @@@ config HW_RANDOM_TP
  	  If unsure, say Y.
  
  config HW_RANDOM_MSM
 -	tristate "Qualcomm MSM Random Number Generator support"
 -	depends on ARCH_MSM
 +	tristate "Qualcomm SoCs Random Number Generator support"
- 	depends on HW_RANDOM && ARCH_QCOM
++	depends on ARCH_QCOM
+ 	default HW_RANDOM
  	---help---
  	  This driver provides kernel-side support for the Random Number
 -	  Generator hardware found on Qualcomm MSM SoCs.
 +	  Generator hardware found on Qualcomm SoCs.
  
  	  To compile this driver as a module, choose M here. the
  	  module will be called msm-rng.

Attachment: pgpIqR0_nBpop.pgp
Description: PGP signature