Merge remote-tracking branch 'irqchip/irq/irqchip-next'

# Conflicts:
#	drivers/irqchip/Kconfig
#	drivers/irqchip/Makefile

diff --cc drivers/irqchip/Kconfig
index d3a14f304ec80caae398c2054c8fb9cfa2ef1703,715eb4366e3580a005b79ba495e1fb41fc05a83a..98b70d81cfcd15df7866ecdd8d821db2fe9214cd
--- 1/drivers/irqchip/Kconfig
--- 2/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -577,12 -577,10 +577,18 @@@ 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.
+ 
  endmenu

diff --cc drivers/irqchip/Makefile
index eb6a515f0f649504f8e9e62481ae732b045c4e32,bef57937e7296b4b48cfd0fc55f10fb81d9890d7..0500ce79086a208d49c0f66038dceb8fd6f226da
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -113,4 -113,4 +113,5 @@@ 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

diff --cc kernel/irq/irqdomain.c
Simple merge