Re: linux-next: manual merge of the irqchip tree with the mips tree

Stephen, On Thu, Nov 27, 2014 at 04:57:19PM +1100, Stephen Rothwell wrote: > Hi Jason, > > Today's linux-next merge of the irqchip tree got a conflict in > drivers/irqchip/Makefile between commit 8a19b8f19429 ("MIPS: Move GIC > to drivers/irqchip/") from the mips tree and commit 5fe3bba3088c > ("

linux-next: manual merge of the irqchip tree with the mips tree

Hi Jason, Today's linux-next merge of the irqchip tree got a conflict in drivers/irqchip/Makefile between commit 8a19b8f19429 ("MIPS: Move GIC to drivers/irqchip/") from the mips tree and commit 5fe3bba3088c ("irqchip: mtk-sysirq: Add sysirq interrupt polarity support") from the irqchip tree. I f