Re: [GIT pull] x86 fixes for 2.6.26
From: Thomas Gleixner
Date: Sat May 17 2008 - 17:08:16 EST
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:
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/