From: Jan Engelhardt <jengelh@medozas.de>
To: kaber@trash.net
Cc: netfilter-devel@vger.kernel.org
Subject: [pull] a bit of tidying
Date: Tue, 16 Mar 2010 02:32:04 +0100 [thread overview]
Message-ID: <1268703135-2622-1-git-send-email-jengelh@medozas.de> (raw)
Hi,
here's a first round for net-next-2.6.35.
Please review.
The following changes since commit 3a5b27bf6f29574d667230c7e76e4b83fe3014e0
[davenext/master @ v2.6.33-4115-g3a5b27b]:
Linus Torvalds (1):
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
are available in the git repository at:
git://dev.medozas.de/linux master
Jan Engelhardt (10):
netfilter: xt_CT: par->family is an nfproto
netfilter: xt_NFQUEUE: consolidate v4/v6 targets into one
netfilter: xtables: add comment markers to Xtables Kconfig
netfilter: xtables: merge xt_MARK into xt_mark
netfilter: xtables: merge xt_CONNMARK into xt_connmark
netfilter: xtables: merge xt_NOTRACK into xt_CT
netfilter: update my email address
netfilter: ebt_ip6: add principal maintainer in a MODULE_AUTHOR tag
netfilter: xt_recent: update description
netfilter: xt_recent: remove old proc directory
Documentation/feature-removal-schedule.txt | 10 ---
include/linux/netfilter/xt_CONNMARK.h | 22 +-----
include/linux/netfilter/xt_MARK.h | 6 +-
include/linux/netfilter/xt_connmark.h | 11 +++
include/linux/netfilter/xt_mark.h | 4 +
net/bridge/netfilter/ebt_ip6.c | 3 +-
net/netfilter/Kconfig | 119 +++++++++++++++-------------
net/netfilter/Makefile | 9 +-
net/netfilter/xt_CONNMARK.c | 113 --------------------------
net/netfilter/xt_CT.c | 58 ++++++++++---
net/netfilter/xt_MARK.c | 56 -------------
net/netfilter/xt_NFQUEUE.c | 40 +++-------
net/netfilter/xt_NOTRACK.c | 53 ------------
net/netfilter/xt_TCPOPTSTRIP.c | 3 +-
net/netfilter/xt_connlimit.c | 1 -
net/netfilter/xt_connmark.c | 86 +++++++++++++++++++-
net/netfilter/xt_hashlimit.c | 2 +-
net/netfilter/xt_mark.c | 35 ++++++++-
net/netfilter/xt_recent.c | 109 +-------------------------
net/netfilter/xt_time.c | 3 +-
net/netfilter/xt_u32.c | 3 +-
21 files changed, 263 insertions(+), 483 deletions(-)
delete mode 100644 net/netfilter/xt_CONNMARK.c
delete mode 100644 net/netfilter/xt_MARK.c
delete mode 100644 net/netfilter/xt_NOTRACK.c
next reply other threads:[~2010-03-16 1:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-16 1:32 Jan Engelhardt [this message]
2010-03-16 1:32 ` [PATCH 01/10] netfilter: xt_CT: par->family is an nfproto Jan Engelhardt
2010-03-16 1:32 ` [PATCH 02/10] netfilter: xt_NFQUEUE: consolidate v4/v6 targets into one Jan Engelhardt
2010-03-16 1:32 ` [PATCH 03/10] netfilter: xtables: add comment markers to Xtables Kconfig Jan Engelhardt
2010-03-16 1:32 ` [PATCH 04/10] netfilter: xtables: merge xt_MARK into xt_mark Jan Engelhardt
2010-03-16 1:32 ` [PATCH 05/10] netfilter: xtables: merge xt_CONNMARK into xt_connmark Jan Engelhardt
2010-03-16 1:32 ` [PATCH 06/10] netfilter: xtables: merge xt_NOTRACK into xt_CT Jan Engelhardt
2010-03-16 17:01 ` Patrick McHardy
2010-03-16 17:16 ` Jan Engelhardt
2010-03-16 17:18 ` Patrick McHardy
2010-03-16 17:30 ` Jan Engelhardt
2010-03-16 17:46 ` Patrick McHardy
2010-03-16 1:32 ` [PATCH 07/10] netfilter: update my email address Jan Engelhardt
2010-03-16 1:32 ` [PATCH 08/10] netfilter: ebt_ip6: add principal maintainer in a MODULE_AUTHOR tag Jan Engelhardt
2010-03-16 1:32 ` [PATCH 09/10] netfilter: xt_recent: update description Jan Engelhardt
2010-03-16 1:32 ` [PATCH 10/10] netfilter: xt_recent: remove old proc directory Jan Engelhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1268703135-2622-1-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).