lkml.org 
[lkml]   [2013]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the dt-rh tree with the imx-mxs tree
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



\
 
 \ /
  Last update: 2013-11-04 16:01    [W:0.046 / U:0.164 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site