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

[Lee Jones]

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:
> 
>   ad4c938c92af ("irqchip/irq-mst: Add MStar interrupt controller support")
> 
> from the irqchip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

It looks as though the 'ib-mfd-gpio-hwmon-irqchip-pwm-watchdog-5.10'
pull-request I sent on Thursday 17th September [0] should be applied
to the IRQChip tree. 

[0] https://patchwork.kernel.org/patch/11783523/

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog