lkml.org 
[lkml]   [2013]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: New tree for linux-next
On Thu, Mar 21, 2013 at 9:09 AM, Grant Likely <grant.likely@secretlab.ca> wrote:
>>> - My branch is based on the latest stable, similarly to what I have
>>> seen elsewhere. One of the patches triggers a merge conflict on
>>> today's linux-next due to a whitespace change. Is there something I
>>> can do to fix this?
>>
>> Do not worry about merge conflicts, that is my and Linus' job.
>
> Latest stable? As in based on one of the linux-stable point releases
> (That Greg does) or based on Linus' tree? It must be based on Linus'
> tree to be mergable into mainline.

That's based on Linus' latest rc. "stable" was ambiguous here, sorry.

Alex.


\
 
 \ /
  Last update: 2013-03-21 03:21    [W:0.038 / U:1.676 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site