linux-next: manual merge of the akpm-current tree with the arm-soc tree

linux-next: manual merge of the akpm-current tree with the arm-soc tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/arm/configs/bcm_defconfig

between commit:

  41463c3e6eae ("ARM: Remove bcm_defconfig")

from the arm-soc tree and commit:

  c41079f16bf2 ("lib, switch CONFIG_PRINTK_TIME to int")

from the akpm-current tree.

I fixed it up (I just deleted the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: manual merge of the akpm-current tree with the arm-soc tree

[Uwe Kleine-König]

On Mon, Mar 03, 2014 at 07:01:52PM +1100, Stephen Rothwell wrote:
> 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).
your resolution and the two earlier ones from today[1] all look right

Best regards
Uwe

[1] The conflicts with

	ddb902cc3459 ("ARM: centralize common multi-platform kconfig options")
	9352b05b6e4e ("ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform")

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

linux-next: manual merge of the akpm-current tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]

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@canb.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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the akpm-current tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm/mach-prima2/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@canb.auug.org.au

diff --cc arch/arm/mach-prima2/Kconfig
index 2c726b4f9356,850ff5500821..000000000000
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@@ -1,8 -1,10 +1,8 @@@
  config ARCH_SIRF
  	bool "CSR SiRF" if ARCH_MULTI_V7
  	select ARCH_REQUIRE_GPIOLIB
 -	select GENERIC_CLOCKEVENTS
  	select GENERIC_IRQ_CHIP
- 	select NO_IOPORT
 -	select MIGHT_HAVE_CACHE_L2X0
+ 	select NO_IOPORT_MAP
  	select PINCTRL
  	select PINCTRL_SIRF
  	help

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the akpm-current tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1024 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm/mach-picoxcell/Kconfig between commit ddb902cc3459 ("ARM:
centralize common multi-platform kconfig options") 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@canb.auug.org.au

diff --cc arch/arm/mach-picoxcell/Kconfig
index eca9eb1c5931,c03cd6ffb429..000000000000
--- a/arch/arm/mach-picoxcell/Kconfig
+++ b/arch/arm/mach-picoxcell/Kconfig
@@@ -1,7 -1,12 +1,7 @@@
  config ARCH_PICOXCELL
  	bool "Picochip PicoXcell" if ARCH_MULTI_V6
  	select ARCH_REQUIRE_GPIOLIB
 -	select ARM_PATCH_PHYS_VIRT
  	select ARM_VIC
 -	select CPU_V6K
  	select DW_APB_TIMER_OF
 -	select GENERIC_CLOCKEVENTS
  	select HAVE_TCM
- 	select NO_IOPORT
+ 	select NO_IOPORT_MAP
 -	select SPARSE_IRQ
 -	select USE_OF

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]