From: Patrick McHardy Subject: Re: [NETFILTER 00/22]: Netfilter update for 2.6.22 Date: Thu, 15 Mar 2007 00:14:25 +0100 Message-ID: <45F881D1.3010701@trash.net> References: <20070314084946.15282.58609.sendpatchset@localhost.localdomain> <20070314.160559.74747185.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: netfilter-devel@lists.netfilter.org To: David Miller Return-path: In-Reply-To: <20070314.160559.74747185.davem@davemloft.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: netfilter-devel-bounces@lists.netfilter.org Errors-To: netfilter-devel-bounces@lists.netfilter.org List-Id: netfilter-devel.vger.kernel.org David Miller wrote: > I have two major merges to do today, one large set from Arnaldo with > more skb data access refinements, and this netfilter set. > > What I'm going to do is merge Arnaldo's first, then your's. > > The logic is that it's easier for me to fix conflicts in your > patch set (since it largely just removes code) than the other > way around. Thanks. I had a quick look at Arnaldo's patches and think there shouldn't be any conflicts, but if there are, just let me know and I'll go over it afterwards.