From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: linux-next: manual merge of the net tree Date: Tue, 09 Dec 2008 15:22:38 -0800 (PST) Message-ID: <20081209.152238.74217915.davem@davemloft.net> References: <20081209132136.c58c0ca5.sfr@canb.auug.org.au> <20081209221708.GH8596@fieldses.org> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:56723 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753362AbYLIXWh (ORCPT ); Tue, 9 Dec 2008 18:22:37 -0500 In-Reply-To: <20081209221708.GH8596@fieldses.org> Sender: linux-next-owner@vger.kernel.org List-ID: To: bfields@fieldses.org Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org, harvey.harrison@gmail.com, chuck.lever@oracle.com From: "J. Bruce Fields" Date: Tue, 9 Dec 2008 17:17:08 -0500 > I could rebase nfsd onto net in this case if that'd simplify your life. > Assuming net never rebases that wouldn't cause additional conflicts for > you. It never rebases, promise :-)