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/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

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/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

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

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

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

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-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")

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-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)

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)

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

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

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-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

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-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