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

From: David Miller
Date: Mon Jan 11 2010 - 02:59:24 EST


From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 11 Jan 2010 18:56:45 +1100

> 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 have no personal preference, you can leave it how it is :)
--
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/