* linux-next: manual merge of the devicetree tree with the imx-mxs tree
@ 2016-09-09 3:10 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2016-09-09 3:10 UTC (permalink / raw)
To: Rob Herring, Shawn Guo
Cc: linux-next, linux-kernel, Andrej Rosano, Rask Ingemann Lambertsen
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
8266b4ae7135 ("devicetree: Add vendor prefix for Inverse Path")
from the imx-mxs tree and commit:
a24f7253f26d ("devicetree: Sort vendor prefixes in alphabetical order")
from the devicetree 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 Documentation/devicetree/bindings/vendor-prefixes.txt
index cc15e9911dc8,4d95a9ddecdf..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -136,7 -134,7 +135,8 @@@ innolux Innolux Corporatio
intel Intel Corporation
intercontrol Inter Control Group
invensense InvenSense Inc.
+inversepath Inverse Path
+ iom Iomega Corporation
isee ISEE 2007 S.L.
isil Intersil
issi Integrated Silicon Solutions Inc.
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the devicetree tree with the imx-mxs tree
@ 2016-06-29 3:47 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2016-06-29 3:47 UTC (permalink / raw)
To: Rob Herring, Shawn Guo
Cc: linux-next, linux-kernel, Kefeng Wang, Alexander Shiyan
Hi Rob,
Today's linux-next merge of the devicetree tree got a conflict in:
arch/arm/mach-imx/mach-imx51.c
between commit:
463f90fa8a12 ("ARM: i.MX: Disable supervisor protect for i.MX51")
from the imx-mxs tree and commit:
850bea2335e4 ("arm: Remove unnecessary of_platform_populate with default match table")
from the devicetree 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 arch/arm/mach-imx/mach-imx51.c
index 0d9049825f0e,ec64de611d90..000000000000
--- a/arch/arm/mach-imx/mach-imx51.c
+++ b/arch/arm/mach-imx/mach-imx51.c
@@@ -52,10 -52,6 +52,8 @@@ static void __init imx51_dt_init(void
{
imx51_ipu_mipi_setup();
imx_src_init();
+
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-
+ imx_aips_allow_unprivileged_access("fsl,imx51-aipstz");
}
static void __init imx51_init_late(void)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-09 3:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-09 3:10 linux-next: manual merge of the devicetree tree with the imx-mxs tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2016-06-29 3:47 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).