[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Mon, 3 Mar 2014 19:01:52 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>,
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,
Rob Herring <robh@...nel.org>,
"Uwe Kleine-König"
<u.kleine-koenig@...gutronix.de>
Subject: linux-next: manual merge of the akpm-current tree with the arm-soc
tree
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm/mach-vexpress/Kconfig between commit 9352b05b6e4e ("ARM: select
MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform") from the arm-soc
tree and commit b096b0b50c4b ("Kconfig: rename HAS_IOPORT to
HAS_IOPORT_MAP") from the akpm-current 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-vexpress/Kconfig
index 80b4be36f10a,02930d69f381..000000000000
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@@ -9,8 -10,12 +9,8 @@@ config ARCH_VEXPRES
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
select HAVE_PATA_PLATFORM
- select HAVE_SMP
select ICST
- select NO_IOPORT
- select MIGHT_HAVE_CACHE_L2X0
+ select NO_IOPORT_MAP
select PLAT_VERSATILE
select PLAT_VERSATILE_CLCD
select POWER_RESET
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists