Re: linux-next: manual merge of the net tree with Linus' tree
From: Stephen Rothwell
Date: Mon Jan 11 2010 - 02:56:57 EST
Hi Dave,
On Sun, 10 Jan 2010 22:50:55 -0800 (PST) David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> That latter commit is specially in the net-next-2.6 tree not the
> net-2.6 tree.
What you call "net-next-2.6", I have always called "net". What you call
"net-2.6", I have always called "net-current". Would you like me to
change the names?
> I'll merge net-2.6 into net-next-2.6 to resolve this, thanks!
Thanks.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp00000.pgp
Description: PGP signature