From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Helgaas <bhelgaas@google.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Zhichang Yuan <yuanzhichang@hisilicon.com>,
Robin Murphy <robin.murphy@arm.com>
Subject: linux-next: manual merge of the pci tree with the arm-soc tree
Date: Tue, 3 Apr 2018 12:00:00 +1000 [thread overview]
Message-ID: <20180403120000.4ff083a0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1324 bytes --]
Hi all,
Today's linux-next merge of the pci tree got a conflict in:
drivers/bus/Makefile
between commit:
1888d3ddc3d6 ("drivers/bus: Move Arm CCN PMU driver")
from the arm-soc tree and commit:
38e3446c5d06 ("HISI LPC: Support the LPC host on Hip06/Hip07 with DT bindings")
from the pci 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/bus/Makefile
index 3d473b8adeac,50bb12a971a0..000000000000
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@@ -5,11 -5,10 +5,13 @@@
# Interconnect bus drivers for ARM platforms
obj-$(CONFIG_ARM_CCI) += arm-cci.o
-obj-$(CONFIG_ARM_CCN) += arm-ccn.o
+
+ obj-$(CONFIG_HISILICON_LPC) += hisi_lpc.o
obj-$(CONFIG_BRCMSTB_GISB_ARB) += brcmstb_gisb.o
+
+# DPAA2 fsl-mc bus
+obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/
+
obj-$(CONFIG_IMX_WEIM) += imx-weim.o
obj-$(CONFIG_MIPS_CDMM) += mips_cdmm.o
obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-04-03 2:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-03 2:00 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-04 22:57 linux-next: manual merge of the pci tree with the arm-soc tree Stephen Rothwell
2022-12-13 16:21 ` Bjorn Helgaas
2022-12-13 16:48 ` Thierry Reding
2022-12-13 19:03 ` Serge Semin
2022-12-13 19:53 ` Bjorn Helgaas
2022-12-13 20:07 ` Bjorn Helgaas
2022-12-13 23:36 ` Serge Semin
2022-12-14 14:37 ` Thierry Reding
2022-12-14 22:07 ` Serge Semin
2022-12-15 12:06 ` Thierry Reding
2022-12-15 23:56 ` Serge Semin
2019-11-06 22:45 Stephen Rothwell
2019-11-07 18:27 ` Olof Johansson
2019-11-07 21:18 ` Bjorn Helgaas
2019-11-08 11:07 ` Lorenzo Pieralisi
2019-11-08 20:18 ` Bjorn Helgaas
2019-11-08 22:29 ` Olof Johansson
2015-08-17 1:08 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=20180403120000.4ff083a0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=robin.murphy@arm.com \
--cc=yuanzhichang@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).