Messages in this thread | | | Date | Fri, 11 Jul 2014 14:30:39 +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 021f653791ad ("irqchip: gic-v3: Initial support for GICv3") 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 ce6e733e0c05,be52492c2291..000000000000 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@@ -10,7 -9,7 +10,8 @@@ config ARM6 select ARM_AMBA select ARM_ARCH_TIMER select ARM_GIC + 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] | |