linux-kernel - linux-next: manual merge of the arm-soc tree with the crypto tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120508172153.b05c9d198b1b81c652a2bde6@canb.auug.org.au>
Date:	Tue, 8 May 2012 17:21:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nicolas Ferre <nicolas.ferre@...el.com>,
	Herbert Xu <herbert@...dor.apana.org.au>
Subject: linux-next: manual merge of the arm-soc tree with the crypto tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/char/hw_random/Kconfig between commit 028fdd87b79a ("hwrng:
Kconfig - modify default state for atmel-rng driver") from the crypto
tree and commit 1234f4bada54 ("hwrng: Kconfig: remove dependency for
atmel-rng driver") from the arm-soc tree.

Juts context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/char/hw_random/Kconfig
index 8cd64f1,b2402eb..0000000
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -62,8 -62,8 +62,8 @@@ config HW_RANDOM_AM
  
  config HW_RANDOM_ATMEL
  	tristate "Atmel Random Number Generator support"
- 	depends on HW_RANDOM && ARCH_AT91SAM9G45
+ 	depends on HW_RANDOM && HAVE_CLK
 -	default HW_RANDOM
 +	default (HW_RANDOM && ARCH_AT91)
  	---help---
  	  This driver provides kernel-side support for the Random Number
  	  Generator hardware found on Atmel AT91 devices.

Content of type "application/pgp-signature" skipped