Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/Kconfig
between commit:
54f481a2308e ("ARM: remove old-style irq entry")
from the arm tree and commit:
00ba9357d189 ("ARM: ixp4xx: Drop custom DMA coherency and bouncing")
from the arm-soc tree.
I fixed it up (see below) 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
diff --cc arch/arm/Kconfig
index 72150cb8db02,d9142ad18c52..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -389,10 -379,10 +386,9 @@@ config ARCH_IOP32
config ARCH_IXP4XX
bool "IXP4xx-based"
depends on MMU
- select ARCH_HAS_DMA_SET_COHERENT_MASK
select ARCH_SUPPORTS_BIG_ENDIAN
+ select ARM_PATCH_PHYS_VIRT
select CPU_XSCALE
- select DMABOUNCE if PCI
- select GENERIC_IRQ_MULTI_HANDLER
select GPIO_IXP4XX
select GPIOLIB
select HAVE_PCI
Attachment:
pgprK2Jeqenzj.pgp
Description: OpenPGP digital signature
