linux-kernel - linux-next: manual merge of the arm-soc tree with the arm 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>] [day] [month] [year] [list]

Message-Id: <20120229161627.b8dd92287d066cd7c0a0284e@canb.auug.org.au>
Date:	Wed, 29 Feb 2012 16:16:27 +1100
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,
	"Jett.Zhou" <jtzhou@...vell.com>,
	Haojian Zhuang <haojian.zhuang@...vell.com>,
	Marc Zyngier <marc.zyngier@....com>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the arm-soc tree with the arm tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit 6905a65879b5 ("ARM: Make the sched_clock
framework mandatory") from the arm tree and commit 4a8f83409da6 ("ARM:
sa1100: clean up clock support") from the arm-soc tree.

Just 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 arch/arm/Kconfig
index 5130989,9f134c4..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -753,7 -760,8 +753,7 @@@ config ARCH_SA110
  	select ARCH_HAS_CPUFREQ
  	select CPU_FREQ
  	select GENERIC_CLOCKEVENTS
- 	select HAVE_CLK
+ 	select CLKDEV_LOOKUP
 -	select HAVE_SCHED_CLOCK
  	select TICK_ONESHOT
  	select ARCH_REQUIRE_GPIOLIB
  	select HAVE_IDE

Content of type "application/pgp-signature" skipped