* linux-next: manual merge of the mips tree with the imx-mxs tree
@ 2015-03-26 1:52 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-03-26 1:52 UTC (permalink / raw)
To: Ralf Baechle, Shawn Guo
Cc: linux-next, linux-kernel, Stefan Agner, Jason Cooper, Kevin Cernekee
[-- Attachment #1: Type: text/plain, Size: 1128 bytes --]
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
drivers/irqchip/Makefile between commit 0494e11aafc7 ("irqchip:
vf610-mscm-ir: Add support for Vybrid MSCM interrupt router") from the
imx-mxs tree and commit 8a1a20290487 ("IRQCHIP: Add new driver for
BCM7038-style level 1 interrupt controllers") 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 9176c76eb164,89e45613de76..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -37,7 -37,7 +37,8 @@@ obj-$(CONFIG_TB10X_IRQC) += irq-tb10x.
obj-$(CONFIG_XTENSA) += irq-xtensa-pic.o
obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o
obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o
+obj-$(CONFIG_SOC_VF610) += irq-vf610-mscm-ir.o
+ obj-$(CONFIG_BCM7038_L1_IRQ) += irq-bcm7038-l1.o
obj-$(CONFIG_BCM7120_L2_IRQ) += irq-bcm7120-l2.o
obj-$(CONFIG_BRCMSTB_L2_IRQ) += irq-brcmstb-l2.o
obj-$(CONFIG_KEYSTONE_IRQ) += irq-keystone.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the mips tree with the imx-mxs tree
@ 2015-06-01 1:41 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-06-01 1:41 UTC (permalink / raw)
To: Ralf Baechle, Shawn Guo; +Cc: linux-next, linux-kernel, Paul Burton
[-- Attachment #1: Type: text/plain, Size: 994 bytes --]
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
drivers/clk/Makefile between commit 33156149fc4a ("ARM: imx: move clock
drivers into drivers/clk") from the imx-mxs tree and commit
66ab9263a018 ("clk: ingenic: add driver for Ingenic SoC CGU clocks")
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/clk/Makefile
index 96e9778ac9bd,cc773271b919..000000000000
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -50,7 -50,7 +50,8 @@@ obj-$(CONFIG_ARCH_BERLIN) += berlin
obj-$(CONFIG_ARCH_HI3xxx) += hisilicon/
obj-$(CONFIG_ARCH_HIP04) += hisilicon/
obj-$(CONFIG_ARCH_HIX5HD2) += hisilicon/
+obj-$(CONFIG_ARCH_MXC) += imx/
+ obj-$(CONFIG_MACH_INGENIC) += ingenic/
obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/
ifeq ($(CONFIG_COMMON_CLK), y)
obj-$(CONFIG_ARCH_MMP) += mmp/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-01 1:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-26 1:52 linux-next: manual merge of the mips tree with the imx-mxs tree Stephen Rothwell
2015-06-01 1:41 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).