linux-kernel - linux-next: manual merge of the mvebu tree with the arm-soc 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]

Date:	Tue, 6 May 2014 11:07:58 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jason Cooper <jason@...edaemon.net>, <andrew@...n.ch>,
	<gregory.clement@...e-electrons.com>,
	<linux-arm-kernel@...ts.infradead.org>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rob Herring <robh@...nel.org>,
	Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/mach-mvebu/Kconfig between commit 55400f3a1f89 ("ARM: mvebu:
clean-up unneeded kconfig selects") from the arm-soc tree and commit
8e6ac2033822 ("ARM: mvebu: enable the ARM SCU on Armada 375 and Armada
38x") from the mvebu tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-mvebu/Kconfig
index bfc5af18e483,d6b0a772a6dd..000000000000
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -3,8 -3,10 +3,9 @@@ config ARCH_MVEB
  	select ARCH_SUPPORTS_BIG_ENDIAN
  	select CLKSRC_MMIO
  	select GENERIC_IRQ_CHIP
 -	select IRQ_DOMAIN
  	select PINCTRL
  	select PLAT_ORION
+ 	select SOC_BUS
  	select MVEBU_MBUS
  	select ZONE_DMA if ARM_LPAE
  	select ARCH_REQUIRE_GPIOLIB
@@@ -36,6 -39,10 +37,9 @@@ config MACH_ARMADA_37
  	select ARM_ERRATA_753970
  	select ARM_GIC
  	select ARMADA_375_CLK
 -	select CPU_V7
+ 	select HAVE_ARM_SCU
+ 	select HAVE_ARM_TWD if SMP
+ 	select HAVE_SMP
  	select MACH_MVEBU_V7
  	select PINCTRL_ARMADA_375
  	help
@@@ -48,6 -55,10 +52,9 @@@ config MACH_ARMADA_38
  	select ARM_ERRATA_753970
  	select ARM_GIC
  	select ARMADA_38X_CLK
 -	select CPU_V7
+ 	select HAVE_ARM_SCU
+ 	select HAVE_ARM_TWD if SMP
+ 	select HAVE_SMP
  	select MACH_MVEBU_V7
  	select PINCTRL_ARMADA_38X
  	help

Content of type "application/pgp-signature" skipped