From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ralf Baechle <ralf@linux-mips•org>,
Yoshinori Sato <ysato@users•sourceforge.jp>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Paul Burton <paul.burton@imgtec•com>
Subject: linux-next: manual merge of the mips tree with the h8300 tree
Date: Mon, 1 Jun 2015 11:41:28 +1000 [thread overview]
Message-ID: <20150601114128.6e91b2ca@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1467 bytes --]
Hi Ralf,
Today's linux-next merge of the mips tree got conflicts in
drivers/irqchip/Kconfig and drivers/irqchip/Makefile between commit
19efb55b79f3 ("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/Kconfig
index 8a7d7807b596,746daf37454c..000000000000
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -160,10 -164,7 +165,15 @@@ config MIPS_GI
bool
select MIPS_CM
+ config INGENIC_IRQ
+ bool
+ depends on MACH_INGENIC
+ default y
++
+config RENESAS_H8300H_INTC
+ bool
+ select IRQ_DOMAIN
+
+config RENESAS_H8S_INTC
+ bool
- select IRQ_DOMAIN
++ select IRQ_DOMAIN
diff --cc drivers/irqchip/Makefile
index f8efb7087760,db014e8e12c9..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -47,5 -48,4 +48,6 @@@ 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_INGENIC_IRQ) += irq-ingenic.o
+obj-$(CONFIG_RENESAS_H8300H_INTC) += irq-renesas-h8300h.o
+obj-$(CONFIG_RENESAS_H8S_INTC) += irq-renesas-h8s.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2015-06-01 1:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20150601114128.6e91b2ca@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul.burton@imgtec$(echo .)com \
--cc=ralf@linux-mips$(echo .)org \
--cc=ysato@users$(echo .)sourceforge.jp \
/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