* linux-next: manual merge of the staging tree with the imx-mxs tree
@ 2014-02-25 6:09 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2014-02-25 6:09 UTC (permalink / raw)
To: Greg KH, Shawn Guo; +Cc: linux-next, linux-kernel, Liu Ying, Russell King
[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]
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 Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/boot/dts/imx51-babbage.dts
index 121dadd125c0,6ff15a0eacb3..000000000000
--- 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";
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the staging tree with the imx-mxs tree
@ 2019-04-12 4:49 Stephen Rothwell
2019-05-08 3:47 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2019-04-12 4:49 UTC (permalink / raw)
To: Greg KH, Shawn Guo
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Robert Yang,
Jonathan Cameron, Jonathan Neuschäfer
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]
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..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -211,7 -210,7 +211,8 @@@ kiebackpeter Kieback & Peter Gmb
kinetic Kinetic Technologies
kingdisplay King & Display Technology Co., Ltd.
kingnovel Kingnovel Technology Co., Ltd.
+ kionix Kionix, Inc.
+kobo Rakuten Kobo Inc.
koe Kaohsiung Opto-Electronics Inc.
kosagi Sutajio Ko-Usagi PTE Ltd.
kyo Kyocera Corporation
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the staging tree with the imx-mxs tree
2019-04-12 4:49 linux-next: manual merge of the staging tree with the imx-mxs tree Stephen Rothwell
@ 2019-05-08 3:47 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2019-05-08 3:47 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, ARM
Cc: Greg KH, Shawn Guo, Linux Next Mailing List,
Linux Kernel Mailing List, Robert Yang, Jonathan Cameron,
Jonathan Neuschäfer
[-- Attachment #1: Type: text/plain, Size: 1618 bytes --]
Hi all,
On Fri, 12 Apr 2019 14:49:21 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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..000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@@ -211,7 -210,7 +211,8 @@@ kiebackpeter Kieback & Peter Gmb
> kinetic Kinetic Technologies
> kingdisplay King & Display Technology Co., Ltd.
> kingnovel Kingnovel Technology Co., Ltd.
> + kionix Kionix, Inc.
> +kobo Rakuten 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-08 3:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-12 4:49 linux-next: manual merge of the staging tree with the imx-mxs tree Stephen Rothwell
2019-05-08 3:47 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-02-25 6:09 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox