linux-next: manual merge of the ixp4xx tree with the arm-soc tree
From: arnd@arndb.de (Arnd Bergmann)
Date: 2012-09-20 15:31:55
Also in:
linux-next, lkml
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 tree and commits 43690ab7543a ("IXP4xx: Always ioremap() Queue
Manager MMIO region at boot") and f62736b567ff ("IXP4xx: map CPU config
registers within VMALLOC region") from the ixp4xx tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).Ok, thanks! This conflict will go away once Krzysztof's patches make it into arm-soc. Arnd