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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/irqchip/Makefile
index db5e37d2db11,f1525149b7a2..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -110,4 -113,4 +112,5 @@@ obj-$(CONFIG_LOONGSON_HTPIC)		+= irq-lo
  obj-$(CONFIG_LOONGSON_HTVEC)		+= irq-loongson-htvec.o
  obj-$(CONFIG_LOONGSON_PCH_PIC)		+= irq-loongson-pch-pic.o
  obj-$(CONFIG_LOONGSON_PCH_MSI)		+= irq-loongson-pch-msi.o
 +obj-$(CONFIG_SL28CPLD_INTC)		+= irq-sl28cpld.o
+ obj-$(CONFIG_MST_IRQ)			+= irq-mst-intc.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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