From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Marc Zyngier <marc.zyngier@arm•com>, Greentime Hu <green.hu@gmail•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Archana Sathyakumar <asathyak@codeaurora•org>
Subject: linux-next: manual merge of the irqchip tree with the nds32 tree
Date: Thu, 15 Mar 2018 16:32:38 +1100 [thread overview]
Message-ID: <20180315163238.3a257f86@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]
Hi Marc,
Today's linux-next merge of the irqchip tree got a conflict in:
drivers/irqchip/Makefile
between commit:
abe45fd9f1b0 ("irqchip: Andestech Internal Vector Interrupt Controller driver")
from the nds32 tree and commit:
f55c73aef890 ("irqchip/pdc: Add PDC interrupt controller for QCOM SoCs")
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 110de02bb215,c35ee5345a53..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -83,4 -85,4 +83,5 @@@ obj-$(CONFIG_IRQ_UNIPHIER_AIDET) += irq
obj-$(CONFIG_ARCH_SYNQUACER) += irq-sni-exiu.o
obj-$(CONFIG_MESON_IRQ_GPIO) += irq-meson-gpio.o
obj-$(CONFIG_GOLDFISH_PIC) += irq-goldfish-pic.o
+obj-$(CONFIG_NDS32) += irq-ativic32.o
+ obj-$(CONFIG_QCOM_PDC) += qcom-pdc.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2018-03-15 5:32 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=20180315163238.3a257f86@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=asathyak@codeaurora$(echo .)org \
--cc=green.hu@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marc.zyngier@arm$(echo .)com \
/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