* linux-next: manual merge of the irqchip tree with the mfd tree
@ 2020-10-12 5:17 Stephen Rothwell
2020-10-12 6:59 ` Lee Jones
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-10-12 5:17 UTC (permalink / raw)
To: Marc Zyngier, Lee Jones
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Mark-PK Tsai,
Michael Walle
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the irqchip tree with the mfd tree
2020-10-12 5:17 linux-next: manual merge of the irqchip tree with the mfd tree Stephen Rothwell
@ 2020-10-12 6:59 ` Lee Jones
0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2020-10-12 6:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Marc Zyngier, Linux Kernel Mailing List, Linux Next Mailing List,
Mark-PK Tsai, Michael Walle
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-12 6:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-12 5:17 linux-next: manual merge of the irqchip tree with the mfd tree Stephen Rothwell
2020-10-12 6:59 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).