Re: linux-next: manual merge of the staging tree with the imx-mxs tree
Hi all,
On Fri, 12 Apr 2019 14:49:21 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
> 189733b0a7e4 ("dt-bindings: Add vendor prefix for Rakuten Kobo, Inc.")
>
> from the imx-mxs tree and commit:
>
> 2e5cee6c7622 ("dt-bindings: Add vendor prefix for Kionix, Inc.")
>
> from the staging 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 5f2b185a04e6,93753f447c20..
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@@ -211,7 -210,7 +211,8 @@@ kiebackpeterKieback & Peter Gmb
> kinetic Kinetic Technologies
> kingdisplay King & Display Technology Co., Ltd.
> kingnovel Kingnovel Technology Co., Ltd.
> + kionix Kionix, Inc.
> +koboRakuten Kobo Inc.
> koe Kaohsiung Opto-Electronics Inc.
> kosagi Sutajio Ko-Usagi PTE Ltd.
> kyo Kyocera Corporation
This is now a conflict between the arm-soc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
pgpe481OxJ2wU.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the staging tree with the imx-mxs tree
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
189733b0a7e4 ("dt-bindings: Add vendor prefix for Rakuten Kobo, Inc.")
from the imx-mxs tree and commit:
2e5cee6c7622 ("dt-bindings: Add vendor prefix for Kionix, Inc.")
from the staging 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 5f2b185a04e6,93753f447c20..
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -211,7 -210,7 +211,8 @@@ kiebackpeterKieback & Peter Gmb
kinetic Kinetic Technologies
kingdisplay King & Display Technology Co., Ltd.
kingnovel Kingnovel Technology Co., Ltd.
+ kionixKionix, Inc.
+kobo Rakuten Kobo Inc.
koe Kaohsiung Opto-Electronics Inc.
kosagiSutajio Ko-Usagi PTE Ltd.
kyo Kyocera Corporation
pgpJOXYs0IKzM.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the staging tree with the imx-mxs tree
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx51-babbage.dts between commit a198af2322a1 ("ARM:
dts: i.MX51 babbage: Support diagnostic LED") from the imx-mxs tree and
commit 17b5001b5143 ("imx-drm: convert to componentised device support")
from the staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/boot/dts/imx51-babbage.dts
index 121dadd125c0,6ff15a0eacb3..
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@@ -81,17 -81,12 +81,23 @@@
};
};
+ leds {
+ compatible = "gpio-leds";
+ pinctrl-names = "default";
+ pinctrl-0 = <_gpio_leds>;
+
+ led-diagnostic {
+ label = "diagnostic";
+ gpios = < 6 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ imx-drm {
+ compatible = "fsl,imx-drm";
+ crtcs = < 0>, < 1>;
+ connectors = <>, <>;
+ };
+
sound {
compatible = "fsl,imx51-babbage-sgtl5000",
"fsl,imx-audio-sgtl5000";
pgpdht7VPb23T.pgp
Description: PGP signature
linux-next: manual merge of the staging tree with the imx-mxs tree
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx51-babbage.dts between commit a198af2322a1 (ARM:
dts: i.MX51 babbage: Support diagnostic LED) from the imx-mxs tree and
commit 17b5001b5143 (imx-drm: convert to componentised device support)
from the staging tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/boot/dts/imx51-babbage.dts
index 121dadd125c0,6ff15a0eacb3..
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@@ -81,17 -81,12 +81,23 @@@
};
};
+ leds {
+ compatible = gpio-leds;
+ pinctrl-names = default;
+ pinctrl-0 = pinctrl_gpio_leds;
+
+ led-diagnostic {
+ label = diagnostic;
+ gpios = gpio2 6 GPIO_ACTIVE_HIGH;
+ };
+ };
+
+ imx-drm {
+ compatible = fsl,imx-drm;
+ crtcs = ipu 0, ipu 1;
+ connectors = display0, display1;
+ };
+
sound {
compatible = fsl,imx51-babbage-sgtl5000,
fsl,imx-audio-sgtl5000;
pgpdht7VPb23T.pgp
Description: PGP signature
