From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752296Ab0AKH7U (ORCPT ); Mon, 11 Jan 2010 02:59:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752246Ab0AKH7T (ORCPT ); Mon, 11 Jan 2010 02:59:19 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:56814 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752202Ab0AKH7S (ORCPT ); Mon, 11 Jan 2010 02:59:18 -0500 Date: Sun, 10 Jan 2010 23:59:27 -0800 (PST) Message-Id: <20100110.235927.83024662.davem@davemloft.net> 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 Subject: Re: linux-next: manual merge of the net tree with Linus' tree From: David Miller In-Reply-To: <20100111185645.a66c6c8a.sfr@canb.auug.org.au> References: <20100111133109.a191ee64.sfr@canb.auug.org.au> <20100110.225055.167520274.davem@davemloft.net> <20100111185645.a66c6c8a.sfr@canb.auug.org.au> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell Date: Mon, 11 Jan 2010 18:56:45 +1100 > On Sun, 10 Jan 2010 22:50:55 -0800 (PST) David Miller 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 :)