From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the net tree with Linus' tree
Date: Sun, 10 Jan 2010 23:59:27 -0800 (PST)
Message-ID: <20100110.235927.83024662.davem@davemloft.net>
References: <20100111133109.a191ee64.sfr@canb.auug.org.au>
	<20100110.225055.167520274.davem@davemloft.net>
	<20100111185645.a66c6c8a.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Return-path: <netdev-owner@vger.kernel.org>
In-Reply-To: <20100111185645.a66c6c8a.sfr@canb.auug.org.au>
Sender: netdev-owner@vger.kernel.org
To: sfr@canb.auug.org.au
Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, hawk@comx.dk, hadi@cyberus.ca
List-Id: linux-next.vger.kernel.org

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jan 2010 18:56:45 +1100

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