lkml.org 
[lkml]   [2012]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: reminder 2
At Thu, 13 Dec 2012 21:39:22 +1100,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> On Thu, 13 Dec 2012 10:42:09 +0100 Takashi Iwai <tiwai@suse.de> wrote:
> >
> > At Thu, 13 Dec 2012 15:32:37 +1100,
> > Stephen Rothwell wrote:
> > >
> > > If you have a tree that is included in linux-next, please clean it up
> > > after it has been merged into your upstream (i.e. Linus' tree in most
> > > cases).
> >
> > What does "clean up" mean in this context exactly?
>
> Well, if the tree you had in linux-next is pulled directly into Linus'
> tree, then you have nothing to do (except maybe a fast forward back merge
> of Linus' tree past the point your tree was merged).
>
> If your tree in linux-next is a merge of other branches that are merged
> into Linus' tree separately, then after they are all merged upstream, you
> should reset your tree to somewhere in Linus' tree.
>
> If you rebased your tree before sending it to Linus (which you should not
> do, of course), and don't update what is in linux-next to match (which
> you should also not do :-)), then you should scold your self (:-)) and
> reset your tree to be somewhere in Linus' tree.
>
> The intent is to give you somewhere nice and clean to start collecting
> your next set of commits for the next release (or bug fixes etc) and to
> minimise the conflicts with what is left in linux-next.

OK, thanks for clarification!


Takashi


\
 
 \ /
  Last update: 2012-12-13 12:21    [W:0.032 / U:0.184 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site