From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ralf Baechle <ralf@linux-mips•org>, Shawn Guo <shawn.guo@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Stefan Agner <stefan@agner•ch>,
Jason Cooper <jason@lakedaemon•net>,
Kevin Cernekee <cernekee@gmail•com>
Subject: linux-next: manual merge of the mips tree with the imx-mxs tree
Date: Thu, 26 Mar 2015 12:52:40 +1100 [thread overview]
Message-ID: <20150326125240.376bbc65@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2015-03-26 1:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-26 1:52 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-01 1:41 linux-next: manual merge of the mips tree with the imx-mxs tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150326125240.376bbc65@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cernekee@gmail$(echo .)com \
--cc=jason@lakedaemon$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
--cc=shawn.guo@linaro$(echo .)org \
--cc=stefan@agner$(echo .)ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox