Re: Announce: Linux-next (Or Andrew's dream :-))

Benny Halevy
2008-02-12T17:57:41Z

On Feb. 12, 2008, 19:41 +0200, James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> On Tue, 2008-02-12 at 09:09 -0800, Linus Torvalds wrote:
>> (a) create a base tree with _just_ that fundamental infrastructure change,
>> and make sure that base branch is so obviously good that there is no
>> question about merging it.
>
> The problem is how do we use a? Usually we need to track your -rc tree
> as our fixes go in ... some of which affect our development trees.
>
> If we stick with (a) as the base, we don't get to pull in the fixes in
> your tree. If we use your tree we have to pull in (a) creating n
> different merge points for the n different upstream trees..

IMHO, this base tree should typically be based off of linus' tree
and kept rebased on top of it. This way you get the mainline fixes
through the integration base tree.

Benny