linux-next: manual merge of the tip tree with the arc tree

From: Stephen Rothwell
Date: Tue May 03 2016 - 23:02:45 EST

Hi all,

Today's linux-next merge of the tip tree got a conflict in:


between commit:

df1a714d52c4 ("irqchip: add nps Internal and external irqchips")

from the arc tree and commit:

9e2c986cb460 ("irqchip: Add per-cpu interrupt partitioning library")

from the tip 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.

Stephen Rothwell

diff --cc drivers/irqchip/Kconfig
index 1ab632a94db3,6c17de7997b9..000000000000
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -245,8 -246,5 +246,11 @@@ config MVEBU_ODM

+config EZNPS_GIC
+ bool "NPS400 Global Interrupt Manager (GIM)"
+ select IRQ_DOMAIN
+ help
+ Support the EZchip NPS400 global interrupt controller
+ bool