* linux-next: manual merge of the mips tree with the arm-soc tree
@ 2019-09-05 0:18 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2019-09-05 0:18 UTC (permalink / raw)
To: Ralf Baechle, James Hogan, Olof Johansson, Arnd Bergmann, ARM
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Paul Cercueil, Paul Burton
[-- Attachment #1: Type: text/plain, Size: 1331 bytes --]
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
drivers/video/fbdev/Makefile
between commit:
c7b46e0c33c5 ("fbdev: remove w90x900/nuc900 platform drivers")
from the arm-soc tree and commit:
e305bff3a706 ("video/fbdev: Drop JZ4740 driver")
from the mips 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/video/fbdev/Makefile
index aab7155884ea,49502d6256cb..000000000000
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@@ -116,7 -116,7 +116,6 @@@ obj-y += om
obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o
obj-$(CONFIG_FB_CARMINE) += carminefb.o
obj-$(CONFIG_FB_MB862XX) += mb862xx/
- obj-$(CONFIG_FB_JZ4740) += jz4740_fb.o
-obj-$(CONFIG_FB_NUC900) += nuc900fb.o
obj-$(CONFIG_FB_PUV3_UNIGFX) += fb-puv3.o
obj-$(CONFIG_FB_HYPERV) += hyperv_fb.o
obj-$(CONFIG_FB_OPENCORES) += ocfb.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the mips tree with the arm-soc tree
@ 2019-09-15 17:20 Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2019-09-15 17:20 UTC (permalink / raw)
To: Ralf Baechle, James Hogan, Arnd Bergmann
Cc: Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
drivers/video/fbdev/Makefile
between commit:
c7b46e0c33c5946 ("fbdev: remove w90x900/nuc900 platform drivers")
from the arm-soc tree and commit:
e305bff3a706f58 ("video/fbdev: Drop JZ4740 driver")
from the mips 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.
diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile
index aab7155884eaa..aa6352798cf4e 100644
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@ -116,7 +116,6 @@ obj-y += omap2/
obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o
obj-$(CONFIG_FB_CARMINE) += carminefb.o
obj-$(CONFIG_FB_MB862XX) += mb862xx/
-obj-$(CONFIG_FB_JZ4740) += jz4740_fb.o
obj-$(CONFIG_FB_PUV3_UNIGFX) += fb-puv3.o
obj-$(CONFIG_FB_HYPERV) += hyperv_fb.o
obj-$(CONFIG_FB_OPENCORES) += ocfb.o
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* linux-next: manual merge of the mips tree with the arm-soc tree
@ 2015-03-23 1:03 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-03-23 1:03 UTC (permalink / raw)
To: Ralf Baechle, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, James Hogan, Geert Uytterhoeven, Simon Horman
[-- Attachment #1: Type: text/plain, Size: 1205 bytes --]
Hi Ralf,
Today's linux-next merge of the mips tree got a conflict in
drivers/bus/Makefile between commit 6320c41198c7 ("drivers: bus: Sort
Makefile entries alphabetically") from the arm-soc tree and commit
cd46cf20d04a ("MIPS: Add CDMM bus support") 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/bus/Makefile
index e023a2bec664,807dd17ef2f8..000000000000
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@@ -2,13 -2,11 +2,14 @@@
# Makefile for the bus drivers.
#
+# Interconnect bus drivers for ARM platforms
+obj-$(CONFIG_ARM_CCI) += arm-cci.o
+obj-$(CONFIG_ARM_CCN) += arm-ccn.o
+
obj-$(CONFIG_BRCMSTB_GISB_ARB) += brcmstb_gisb.o
-obj-$(CONFIG_IMX_WEIM) += imx-weim.o
+obj-$(CONFIG_IMX_WEIM) += imx-weim.o
+ obj-$(CONFIG_MIPS_CDMM) += mips_cdmm.o
-obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o
-obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o
+obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o
# Interconnect bus driver for OMAP SoCs.
obj-$(CONFIG_OMAP_INTERCONNECT) += omap_l3_smx.o omap_l3_noc.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-15 17:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-05 0:18 linux-next: manual merge of the mips tree with the arm-soc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-09-15 17:20 Mark Brown
2015-03-23 1:03 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).