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

2012-09-20 Thread Arnd Bergmann
On Thursday 20 September 2012, Stephen Rothwell wrote: > Today's linux-next merge of the ixp4xx tree got conflicts in > arch/arm/mach-ixp4xx/common.c and > arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h between commit > 13ec32f47cb4 ("ARM: ixp4xx: use __iomem pointers for MMIO") from the > arm-soc

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

2012-09-19 Thread Stephen Rothwell
Hi Krzysztof, Today's linux-next merge of the ixp4xx tree got conflicts in arch/arm/mach-ixp4xx/common.c and arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h between commit 13ec32f47cb4 ("ARM: ixp4xx: use __iomem pointers for MMIO") from the arm-soc tree and commits 43690ab7543a ("IXP4xx: Always io