Subject: linux-next: manual merge of the irqchip tree with the arm-soc tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 23 Apr 2021 13:22:28 +1000

Hi all,

Today's linux-next merge of the irqchip tree got conflicts in:

  drivers/irqchip/Kconfig
  drivers/irqchip/Makefile

between commit:

  76cde2639411 ("irqchip/apple-aic: Add support for the Apple Interrupt Controller")

from the arm-soc tree and commit:

  529ea3681811 ("irqchip: Add support for IDT 79rc3243x interrupt controller")

from the irqchip 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 drivers/irqchip/Kconfig
index d3a14f304ec8,18b0d0b33b8b..000000000000
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -577,12 -577,15 +577,23 @@@ config MST_IR
  	help
  	  Support MStar Interrupt Controller.
  
 +config APPLE_AIC
 +	bool "Apple Interrupt Controller (AIC)"
 +	depends on ARM64
 +	default ARCH_APPLE
 +	help
 +	  Support for the Apple Interrupt Controller found on Apple Silicon SoCs,
 +	  such as the M1.
 +
+ config WPCM450_AIC
+ 	bool "Nuvoton WPCM450 Advanced Interrupt Controller"
+ 	depends on ARCH_WPCM450
+ 	help
+ 	  Support for the interrupt controller in the Nuvoton WPCM450 BMC SoC.
+ 
+ config IRQ_IDT3243X
+ 	bool
+ 	select GENERIC_IRQ_CHIP
+ 	select IRQ_DOMAIN
+ 
  endmenu
diff --cc drivers/irqchip/Makefile
index eb6a515f0f64,18573602a939..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -113,4 -113,5 +113,6 @@@ obj-$(CONFIG_LOONGSON_PCH_MSI)		+= irq-
  obj-$(CONFIG_MST_IRQ)			+= irq-mst-intc.o
  obj-$(CONFIG_SL28CPLD_INTC)		+= irq-sl28cpld.o
  obj-$(CONFIG_MACH_REALTEK_RTL)		+= irq-realtek-rtl.o
 +obj-$(CONFIG_APPLE_AIC)			+= irq-apple-aic.o
+ obj-$(CONFIG_WPCM450_AIC)		+= irq-wpcm450-aic.o
+ obj-$(CONFIG_IRQ_IDT3243X)		+= irq-idt3243x.o