Messages in this thread | | | Date | Fri, 18 Jul 2014 15:19:30 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the irqchip tree with the arm64 tree |
| |
Hi Jason,
Today's linux-next merge of the irqchip tree got a conflict in arch/arm64/Kconfig between commit 875cbf3e4614 ("arm64: Add audit support") from the arm64 tree and commit 3e44358c12cc ("irqchip: gic: Add support for ARM GICv2m MSI(-X)") from the irqchip 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/arm64/Kconfig index 27bbdb7a5b83,0f9b11de7816..000000000000 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@@ -11,7 -9,8 +11,9 @@@ config ARM6 select ARM_AMBA select ARM_ARCH_TIMER select ARM_GIC + select ARM_GIC_V2M if (PCI && PCI_MSI) + select ARM_GIC_V3 + select AUDIT_ARCH_COMPAT_GENERIC select BUILDTIME_EXTABLE_SORT select CLONE_BACKWARDS select COMMON_CLK [unhandled content-type:application/pgp-signature] | |