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

Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/irqchip/Kconfig drivers/irqchip/Makefile between commit: 44df427c894a ("irqchip: add nps Internal and external irqchips") from the arc tree and commit: b8f3ebe630a4 ("irqchip: Add Layerscape SCFG MSI controlle

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

Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/irqchip/Kconfig 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 t