lkml.org 
[lkml]   [2008]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT pull] x86 fixes for 2.6.26
On Sat, 17 May 2008, Linus Torvalds wrote:
> On Sat, 17 May 2008, Ingo Molnar wrote:
> >
> > We've solved it by still doing the merges (we _need_ the information
> > about potential upcoming merge trouble), but we dont commit them to the
> > topic branches - we throw them away.
>
> And that is *absolutely* the right thing to do.
>
> Poeple need to test the different topic branches together some way anyway,
> regardless of upcoming merge trouble, so yes, when you have more than one
> branch, you inevitably need to have a "test branch" that ties them all
> together for testing the end result (and that test branch generally would
> be a throw-away one, like linux-next. In fact, it could *be* linux-next,
> but there's good reason for you to test your own branches together rather
> than waiting for an external entity to notice that your branches don't
> work together).
>
> So yes, sounds good.

In meantime - until we sorted out our new git life - can you please
pull the fixes without the noisy merge commits (resolved by rebasing
to keep thing rolling) from:

ssh://master.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus

Thanks,
tglx


\
 
 \ /
  Last update: 2008-05-17 23:11    [W:0.071 / U:0.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site