From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: net-2.6.25 being rebased... Date: Tue, 11 Dec 2007 11:56:19 -0800 (PST) Message-ID: <20071211.115619.199600421.davem@davemloft.net> References: <20071211.092638.148402625.davem@davemloft.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: netdev@vger.kernel.org Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:51806 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753905AbXLKT4U (ORCPT ); Tue, 11 Dec 2007 14:56:20 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id E0D1F35C001 for ; Tue, 11 Dec 2007 11:56:19 -0800 (PST) In-Reply-To: <20071211.092638.148402625.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org List-ID: From: David Miller Date: Tue, 11 Dec 2007 09:26:38 -0800 (PST) > I want to work out all the conflicts now that Linus has pulled > in my most recent batch of fixes. > > I hope to have it done in the next hour or so. The rebase of net-2.6.25 is complete, sorry for taking so long.