Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753598Ab0LOWzQ (ORCPT ); Wed, 15 Dec 2010 17:55:16 -0500 Received: from stinky.trash.net ([213.144.137.162]:60730 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752348Ab0LOWzN (ORCPT ); Wed, 15 Dec 2010 17:55:13 -0500 Message-ID: <4D09474E.1070100@trash.net> Date: Wed, 15 Dec 2010 23:55:10 +0100 From: Patrick McHardy User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Thunderbird/3.1.7 MIME-Version: 1.0 To: Randy Dunlap CC: KOVACS Krisztian , Stephen Rothwell , netfilter-devel@vger.kernel.org, linux-next@vger.kernel.org, LKML , netdev , Balazs Scheidler Subject: Re: linux-next: Tree for November 18 (netfilter) References: <20101118134256.fe132215.sfr@canb.auug.org.au> <20101118092520.6ad964c7.randy.dunlap@oracle.com> <4CE5712B.2080909@trash.net> <1290428077.725556.3.camel@nienna.balabit> <1290428929.726241.1.camel@nienna.balabit> <4CEA97FE.4080006@oracle.com> In-Reply-To: <4CEA97FE.4080006@oracle.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1263 Lines: 31 Am 22.11.2010 17:19, schrieb Randy Dunlap: > On 11/22/10 04:28, KOVACS Krisztian wrote: >> commit ec0ac6f3e7749e25f481c1e0f75766974820fe84 >> Author: KOVACS Krisztian >> Date: Mon Nov 22 13:07:15 2010 +0100 >> >> netfilter: fix compilation when conntrack is disabled but tproxy is enabled >> >> The IPv6 tproxy patches split IPv6 defragmentation off of conntrack, but >> failed to update the #ifdef stanzas guarding the defragmentation related >> fields and code in skbuff and conntrack related code in nf_defrag_ipv6.c. >> >> This patch adds the required #ifdefs so that IPv6 tproxy can truly be used >> without connection tracking. >> >> Original report: >> http://marc.info/?l=linux-netdev&m=129010118516341&w=2 >> >> Reported-by: Randy Dunlap >> Signed-off-by: KOVACS Krisztian > > That builds. Thanks. > > Acked-by: Randy Dunlap Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/