* linux-next: manual merge of the irqchip tree with the arm64 tree
@ 2014-07-18 5:19 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-07-18 5:19 UTC (permalink / raw)
To: Jason Cooper, Catalin Marinas
Cc: linux-next, linux-kernel, Suravee Suthikulpanit, AKASHI Takahiro
[-- Attachment #1: Type: text/plain, Size: 859 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* linux-next: manual merge of the irqchip tree with the arm64 tree
@ 2014-07-11 4:30 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-07-11 4:30 UTC (permalink / raw)
To: Jason Cooper, Catalin Marinas
Cc: linux-next, linux-kernel, Marc Zyngier, AKASHI Takahiro
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-18 5:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-18 5:19 linux-next: manual merge of the irqchip tree with the arm64 tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-07-11 4:30 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox