* linux-next: manual merge of the dt-rh tree with the arm-soc tree
@ 2014-01-17 3:23 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2014-01-17 3:23 UTC (permalink / raw)
To: Rob Herring, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, "Lothar Waßmann",
Arnaud Ebalard, Jason Cooper, Thierry Reding
[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in
Documentation/devicetree/bindings/vendor-prefixes.txt between commits
70e123373c05 ("rtc: Add support for Intersil ISL12057 I2C RTC chip") from
the arm-soc tree and 53d6b36020c7 ("of: Add vendor prefix for LG
Corporation") from Linus' tree and commit 7e73700ce785 ("of: add vendor
prefix for Ka-Ro electronics GmbH") from the dt-rh 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 Documentation/devicetree/bindings/vendor-prefixes.txt
index d92c88f551f9,d98fa9a6279c..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -42,8 -38,7 +42,9 @@@ ibm International Business Machines (IB
idt Integrated Device Technologies, Inc.
img Imagination Technologies Ltd.
intercontrol Inter Control Group
+isl Intersil
+ karo Ka-Ro electronics GmbH
+lg LG Corporation
linux Linux-specific binding
lsi LSI Corp. (LSI Logic)
marvell Marvell Technology Group Ltd.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the dt-rh tree with the arm-soc tree
@ 2014-05-22 7:10 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2014-05-22 7:10 UTC (permalink / raw)
To: Rob Herring, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Pawel Moll
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in
arch/arm/mach-vexpress/platsmp.c between commit d2606f81d563 ("ARM:
vexpress: Simplify SMP operations for DT-powered system") from the
arm-soc tree and commit 9d0c4dfedd96 ("of/fdt: update
of_get_flat_dt_prop in prep for libfdt") from the dt-rh tree.
I fixed it up (the former removed the code modified by the latter) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the dt-rh tree with the arm-soc tree
@ 2015-06-24 3:31 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-06-24 3:31 UTC (permalink / raw)
To: Rob Herring, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Andrew Lunn, Jun Nie, Kevin Hilman
[-- Attachment #1: Type: text/plain, Size: 949 bytes --]
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
d5553cb05a04 ("ARM: dts: zx: add an initial zx296702 dts and doc")
from the arm-soc tree and commit:
72d942e23cda ("of: Add vendor prefix for Zodiac Inflight Innovations")
from the dt-rh 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 Documentation/devicetree/bindings/vendor-prefixes.txt
index a0aa80bb3480,c400c95abc67..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -225,4 -211,4 +225,5 @@@ xillybus Xillybus Ltd
xlnx Xilinx
zyxel ZyXEL Communications Corp.
zarlink Zarlink Semiconductor
+ zii Zodiac Inflight Innovations
+zte ZTE Corp.
[-- 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:[~2015-06-24 3:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-22 7:10 linux-next: manual merge of the dt-rh tree with the arm-soc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2015-06-24 3:31 Stephen Rothwell
2014-01-17 3:23 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox