* linux-next: manual merge of the mips tree with the arm and h8300 trees
@ 2015-06-02 0:41 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-06-02 0:41 UTC (permalink / raw)
To: Ralf Baechle, Russell King, Yoshinori Sato
Cc: linux-next, linux-kernel, Paul Burton, Dmitry Eremin-Solenikov
[-- Attachment #1: Type: text/plain, Size: 1125 bytes --]
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
drivers/irqchip/Makefile between commits 22b67acd99c0 ("ARM: 8368/1:
sa1100: move irq driver to drivers/irqchip/") from the arm tree and
eba5540f0103 ("h8300: IRQ chip driver") from the h8300 tree and commit
a7c64f0e29a6 ("MIPS/IRQCHIP: Move Ingenic SoC intc driver to
drivers/irqchip") from the mips tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/irqchip/Makefile
index ed9553322638,db014e8e12c9..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -47,6 -48,4 +48,7 @@@ obj-$(CONFIG_KEYSTONE_IRQ) += irq-keys
obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o
obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o
obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o
+obj-$(CONFIG_ARCH_SA1100) += irq-sa11x0.o
+obj-$(CONFIG_RENESAS_H8300H_INTC) += irq-renesas-h8300h.o
+obj-$(CONFIG_RENESAS_H8S_INTC) += irq-renesas-h8s.o
+ obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-06-02 0:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-02 0:41 linux-next: manual merge of the mips tree with the arm and h8300 trees Stephen Rothwell
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).