* [PATCH 00/80] netfilter: netfilter update
@ 2011-01-20 7:58 kaber
2011-01-20 7:58 ` [PATCH] netfilter: xtables: remove extraneous header that slipped in kaber
2011-01-20 8:23 ` [PATCH 00/80] netfilter: netfilter update David Miller
0 siblings, 2 replies; 3+ messages in thread
From: kaber @ 2011-01-20 7:58 UTC (permalink / raw)
To: davem; +Cc: netfilter-devel, netdev
[resend of the previous pull request, I've added Jan's fix to my tree,
just resending the new patch instead of the entire batch]
following is a first batch of netfilter patches for 2.6.39, containing:
- cleanups and removal of atomic operations from Changli Gao
- RCU annotations, removal of atomic operations and cleanups from Eric
- a new queue bypass option for nfnetlink_queue from Florian Westphal
- arp_tables support for xt_CLASSIFY from Frederic Leroy
- a new backup protocol for IPVS from and Schillstrom
- IPVS netns support from Hans Schillstrom
- type and header cleanups from Jan
- missing module aliases from Jan
- a new SNMP conntrack helper from Jiri Olsa
- optional timestamping for conntrack entries to simplify userspace IPFIX,
implementations, from Pablo
- a new AUDIT target for logging packets through the audit framework,
from Thomas
- Improvements for the IPVS persistence engine from Simon
ipset from Jozsef will follow soon, once I'm done reviewing it.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git master
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] netfilter: xtables: remove extraneous header that slipped in
2011-01-20 7:58 [PATCH 00/80] netfilter: netfilter update kaber
@ 2011-01-20 7:58 ` kaber
2011-01-20 8:23 ` [PATCH 00/80] netfilter: netfilter update David Miller
1 sibling, 0 replies; 3+ messages in thread
From: kaber @ 2011-01-20 7:58 UTC (permalink / raw)
To: davem; +Cc: netfilter-devel, netdev
From: Jan Engelhardt <jengelh@medozas.de>
Commit 0b8ad87 (netfilter: xtables: add missing header files to export
list) erroneously added this.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 00/80] netfilter: netfilter update
2011-01-20 7:58 [PATCH 00/80] netfilter: netfilter update kaber
2011-01-20 7:58 ` [PATCH] netfilter: xtables: remove extraneous header that slipped in kaber
@ 2011-01-20 8:23 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2011-01-20 8:23 UTC (permalink / raw)
To: kaber; +Cc: netfilter-devel, netdev
From: kaber@trash.net
Date: Thu, 20 Jan 2011 08:58:01 +0100
> [resend of the previous pull request, I've added Jan's fix to my tree,
> just resending the new patch instead of the entire batch]
...
> Please pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git master
Much better, pulled and pushed back out, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-20 8:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-20 7:58 [PATCH 00/80] netfilter: netfilter update kaber
2011-01-20 7:58 ` [PATCH] netfilter: xtables: remove extraneous header that slipped in kaber
2011-01-20 8:23 ` [PATCH 00/80] netfilter: netfilter update David Miller
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).