From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH 0/4][RFC] lro: Generic Large Receive Offload for TCP traffic Date: Mon, 30 Jul 2007 20:00:30 -0400 Message-ID: <46AE7B9E.7030505@garzik.org> References: <200707301724.33865.ossthema@de.ibm.com> <46AE0F36.8030605@garzik.org> <20070730.154332.72713181.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: ossthema@de.ibm.com, netdev@vger.kernel.org, raisch@de.ibm.com, themann@de.ibm.com, linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, meder@de.ibm.com, tklein@de.ibm.com, stefan.roscher@de.ibm.com, gallatin@myri.com To: David Miller Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:49866 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932170AbXGaAAh (ORCPT ); Mon, 30 Jul 2007 20:00:37 -0400 In-Reply-To: <20070730.154332.72713181.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org David Miller wrote: > From: Jeff Garzik > Date: Mon, 30 Jul 2007 12:17:58 -0400 > >> David, thoughts on merging? I'm not We could stick this into your tree >> or mine. Whether yours or mine, I would like to keep the driver and >> net-core patches together in the same git tree. > > No objections and I'll stick it into my net-2.6.24 tree once I cut > that, I'll have the NAPI stuff in there too so I'll keep these two > merge nightmares out of your hair :-) Works for me. Thanks, Jeff