lkml.org 
[lkml]   [2010]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the net tree with Linus' tree
Hi Dave,

On Sun, 10 Jan 2010 22:50:55 -0800 (PST) David Miller <davem@davemloft.net> 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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-01-11 08:59    [W:0.035 / U:11.404 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site