From patchwork Thu Jan 20 01:36:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 79632 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 476CFB70A3 for ; Thu, 20 Jan 2011 12:36:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754744Ab1ATBgM (ORCPT ); Wed, 19 Jan 2011 20:36:12 -0500 Received: from borg.medozas.de ([188.40.89.202]:59659 "EHLO borg.medozas.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752369Ab1ATBgL (ORCPT ); Wed, 19 Jan 2011 20:36:11 -0500 Received: by borg.medozas.de (Postfix, from userid 25121) id 7069AF0C32AA0; Thu, 20 Jan 2011 02:36:10 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by borg.medozas.de (Postfix) with ESMTP id 5B4EE17D4; Thu, 20 Jan 2011 02:36:10 +0100 (CET) Date: Thu, 20 Jan 2011 02:36:10 +0100 (CET) From: Jan Engelhardt To: Patrick McHardy cc: David Miller , netfilter-devel@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [PATCH 00/79] netfilter: netfilter update In-Reply-To: <4D378C3B.1020202@trash.net> Message-ID: References: <1295464519-21763-1-git-send-email-kaber@trash.net> <20110119.135504.149816150.davem@davemloft.net> <20110119.165045.25148392.davem@davemloft.net> <4D378C3B.1020202@trash.net> User-Agent: Alpine 2.01 (LNX 1266 2009-07-14) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thursday 2011-01-20 02:13, Patrick McHardy wrote: >> +header-y += xt_secmark.h >> >> No active tree has a include/linux/netfilter/xt_secmark.h file. Therefore >> we end up with: >> >> Did you mean xt_SECMARK.h (caps)? > >I guess so. Jan, please fix this up. parent f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82 (v2.6.37-3820-gf5c88f5) commit 51c7fc9e4e086e4a145617945fdda92a8ae0290f Author: Jan Engelhardt Date: Thu Jan 20 02:34:48 2011 +0100 netfilter: xtables: remove extraneous header that slipped in Commit 0b8ad876275c74e4bfb6ec3150793f3c0ecfcee2 erroneously added this. Signed-off-by: Jan Engelhardt --- include/linux/netfilter/Kbuild | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild index fc4e0aa..89c0d1e 100644 --- a/include/linux/netfilter/Kbuild +++ b/include/linux/netfilter/Kbuild @@ -56,7 +56,6 @@ header-y += xt_rateest.h header-y += xt_realm.h header-y += xt_recent.h header-y += xt_sctp.h -header-y += xt_secmark.h header-y += xt_socket.h header-y += xt_state.h header-y += xt_statistic.h