Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git

diff --cc drivers/iommu/iommu.c
Simple merge

diff --cc drivers/irqchip/Kconfig
Simple merge

diff --cc drivers/irqchip/irq-gic-v2m.c
Simple merge

diff --cc drivers/irqchip/irq-gic-v3-its.c
Simple merge

diff --cc drivers/irqchip/irq-gic-v3-mbi.c
Simple merge

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

diff --cc kernel/irq/Kconfig
Simple merge