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

On Mon, 12 Oct 2020, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the irqchip tree got a conflict in: > > drivers/irqchip/Makefile > > between commit: > > 03ac990e0ac0 ("irqchip: Add sl28cpld interrupt controller support") > > from the mfd tree and commit: > >

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

Hi all, Today's linux-next merge of the irqchip tree got a conflict in: drivers/irqchip/Makefile between commit: 03ac990e0ac0 ("irqchip: Add sl28cpld interrupt controller support") from the mfd tree and commit: ad4c938c92af ("irqchip/irq-mst: Add MStar interrupt controller support")