Merge remote-tracking branch 'irqdomain/irqdomain/next'

Conflicts:
	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index cf006d40342ca4d51a0128ca0ae60dc36452cd6f,c857283fb4090e7f4b4eb4093bbfaa67e679e2e1..afa5033b664e6b1152ada164e6e92ecefcb239bc
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -33,7 -31,8 +33,8 @@@ config AR
        select GENERIC_IRQ_SHOW
        select CPU_PM if (SUSPEND || CPU_IDLE)
        select GENERIC_PCI_IOMAP
 +      select HAVE_BPF_JIT if NET
+       select IRQ_DOMAIN
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and

diff --cc arch/arm/common/Kconfig
Simple merge

diff --cc drivers/gpio/gpio-pl061.c
Simple merge

diff --cc include/linux/irq.h
Simple merge