Re: linux-next: manual merge of the block tree with Linus' tree

[Stephen Rothwell]

Hi Sedat,

On Mon, 7 Mar 2011 12:25:23 +0100 Sedat Dilek <sedat.dilek@xxxxxxxxxxxxxx> wrote:
>
> No, I tried to merge your for-next into linux-next (which will happen
> with tomorrows linux-next).

No, it won't.  Each day I start with Linus' tree and merge all the other
trees.  Doing it the other way would lead to a real mess.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature