* linux-next: manual merge of the dt-rh tree with the imx-mxs tree
@ 2013-11-04 4:27 Stephen Rothwell
2013-11-04 13:17 ` Shawn Guo
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2013-11-04 4:27 UTC (permalink / raw)
To: Rob Herring
Cc: linux-next, linux-kernel, Rostislav Lisovy, Shawn Guo, Silvio F
[-- Attachment #1: Type: text/plain, Size: 1178 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
064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies
s.r.o") from the imx-mxs tree and commit d6c3073e7fb5 ("DT: sort
vendor-prefixes.txt") 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 8319844fb68d,640e86dc0ae7..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -65,13 -66,12 +67,13 @@@ snps Synopsys, Inc
st STMicroelectronics
ste ST-Ericsson
stericsson ST-Ericsson
- toumaz Toumaz
ti Texas Instruments
toshiba Toshiba Corporation
+ toumaz Toumaz
v3 V3 Semiconductor
via VIA Technologies, Inc.
+voipac Voipac Technologies s.r.o.
+ winbond Winbond Electronics corp.
wlf Wolfson Microelectronics
wm Wondermedia Technologies, Inc.
- winbond Winbond Electronics corp.
xlnx Xilinx
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree
2013-11-04 4:27 linux-next: manual merge of the dt-rh tree with the imx-mxs tree Stephen Rothwell
@ 2013-11-04 13:17 ` Shawn Guo
2013-11-04 14:15 ` Rob Herring
0 siblings, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2013-11-04 13:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rob Herring, linux-next, linux-kernel, Rostislav Lisovy, Silvio F
On Mon, Nov 04, 2013 at 03:27:39PM +1100, Stephen Rothwell wrote:
> Hi Rob,
>
> Today's linux-next merge of the dt-rh tree got a conflict in
> Documentation/devicetree/bindings/vendor-prefixes.txt between commit
> 064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies
> s.r.o") from the imx-mxs tree and commit d6c3073e7fb5 ("DT: sort
> vendor-prefixes.txt") from the dt-rh tree.
Hi Rob,
Would you like to apply the patch "ARM: dts: Add vendor prefix for
Voipac Technologies s.r.o" on your tree, so that we can save this
conflict? If so, I will drop the patch from my tree. Just let me know.
Shawn
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree
2013-11-04 13:17 ` Shawn Guo
@ 2013-11-04 14:15 ` Rob Herring
2013-11-04 14:36 ` Shawn Guo
0 siblings, 1 reply; 5+ messages in thread
From: Rob Herring @ 2013-11-04 14:15 UTC (permalink / raw)
To: Shawn Guo, Stephen Rothwell
Cc: linux-next, linux-kernel, Rostislav Lisovy, Silvio F
On 11/04/2013 07:17 AM, Shawn Guo wrote:
> On Mon, Nov 04, 2013 at 03:27:39PM +1100, Stephen Rothwell wrote:
>> Hi Rob,
>>
>> Today's linux-next merge of the dt-rh tree got a conflict in
>> Documentation/devicetree/bindings/vendor-prefixes.txt between commit
>> 064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies
>> s.r.o") from the imx-mxs tree and commit d6c3073e7fb5 ("DT: sort
>> vendor-prefixes.txt") from the dt-rh tree.
>
> Hi Rob,
>
> Would you like to apply the patch "ARM: dts: Add vendor prefix for
> Voipac Technologies s.r.o" on your tree, so that we can save this
> conflict? If so, I will drop the patch from my tree. Just let me know.
Unless it is the top commit, it is best to not rebase your tree.
Rob
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree
2013-11-04 14:15 ` Rob Herring
@ 2013-11-04 14:36 ` Shawn Guo
2013-11-04 14:47 ` Rob Herring
0 siblings, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2013-11-04 14:36 UTC (permalink / raw)
To: Rob Herring
Cc: Stephen Rothwell, linux-next, linux-kernel, Rostislav Lisovy, Silvio F
On Mon, Nov 04, 2013 at 08:15:50AM -0600, Rob Herring wrote:
> On 11/04/2013 07:17 AM, Shawn Guo wrote:
> > On Mon, Nov 04, 2013 at 03:27:39PM +1100, Stephen Rothwell wrote:
> >> Hi Rob,
> >>
> >> Today's linux-next merge of the dt-rh tree got a conflict in
> >> Documentation/devicetree/bindings/vendor-prefixes.txt between commit
> >> 064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies
> >> s.r.o") from the imx-mxs tree and commit d6c3073e7fb5 ("DT: sort
> >> vendor-prefixes.txt") from the dt-rh tree.
> >
> > Hi Rob,
> >
> > Would you like to apply the patch "ARM: dts: Add vendor prefix for
> > Voipac Technologies s.r.o" on your tree, so that we can save this
> > conflict? If so, I will drop the patch from my tree. Just let me know.
>
> Unless it is the top commit, it is best to not rebase your tree.
I'm queuing the patch for 3.14, and my branch will be rebased to
3.13-rc anyway.
Are you queuing "DT: sort vendor-prefixes.txt" for 3.13 or 3.14? If
it's for 3.13, we will be fine, since the conflict will be solved on my
side when my branch gets rebased to 3.13-rc.
Shawn
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree
2013-11-04 14:36 ` Shawn Guo
@ 2013-11-04 14:47 ` Rob Herring
0 siblings, 0 replies; 5+ messages in thread
From: Rob Herring @ 2013-11-04 14:47 UTC (permalink / raw)
To: Shawn Guo
Cc: Stephen Rothwell, linux-next, linux-kernel, Rostislav Lisovy, Silvio F
On 11/04/2013 08:36 AM, Shawn Guo wrote:
> On Mon, Nov 04, 2013 at 08:15:50AM -0600, Rob Herring wrote:
>> On 11/04/2013 07:17 AM, Shawn Guo wrote:
>>> On Mon, Nov 04, 2013 at 03:27:39PM +1100, Stephen Rothwell wrote:
>>>> Hi Rob,
>>>>
>>>> Today's linux-next merge of the dt-rh tree got a conflict in
>>>> Documentation/devicetree/bindings/vendor-prefixes.txt between commit
>>>> 064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies
>>>> s.r.o") from the imx-mxs tree and commit d6c3073e7fb5 ("DT: sort
>>>> vendor-prefixes.txt") from the dt-rh tree.
>>>
>>> Hi Rob,
>>>
>>> Would you like to apply the patch "ARM: dts: Add vendor prefix for
>>> Voipac Technologies s.r.o" on your tree, so that we can save this
>>> conflict? If so, I will drop the patch from my tree. Just let me know.
>>
>> Unless it is the top commit, it is best to not rebase your tree.
>
> I'm queuing the patch for 3.14, and my branch will be rebased to
> 3.13-rc anyway.
>
> Are you queuing "DT: sort vendor-prefixes.txt" for 3.13 or 3.14? If
> it's for 3.13, we will be fine, since the conflict will be solved on my
> side when my branch gets rebased to 3.13-rc.
It is for 3.13.
Rob
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-11-04 14:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-04 4:27 linux-next: manual merge of the dt-rh tree with the imx-mxs tree Stephen Rothwell
2013-11-04 13:17 ` Shawn Guo
2013-11-04 14:15 ` Rob Herring
2013-11-04 14:36 ` Shawn Guo
2013-11-04 14:47 ` Rob Herring
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).