David S. Miller b86c761f69 Merge branch 'master' of git://1984.lsi.us.es/nf ...

Pablo Neira Ayuso says:

====================
The following patchset contains two bugfixes for netfilter/ipset via
Jozsef Kadlecsik, they are:

* Fix timeout corruption if sets are resized, by Josh Hunt.

* Fix bogus error report if the flag nomatch is set, from Jozsef.
====================

Signed-off-by: David S. Miller <[email protected]>

2013-02-26 17:24:26 -05:00

..

ipset

netfilter: ipset: timeout values corrupted on set resize

2013-02-21 17:34:47 +01:00

nf_conntrack_amanda.h

netfilter: nf_nat: add protoff argument to packet mangling functions

2012-08-30 03:00:13 +02:00

nf_conntrack_common.h

UAPI: (Scripted) Disintegrate include/linux/netfilter

2012-10-09 09:48:54 +01:00

nf_conntrack_dccp.h

…

nf_conntrack_ftp.h

UAPI: (Scripted) Disintegrate include/linux/netfilter

2012-10-09 09:48:54 +01:00

nf_conntrack_h323_asn1.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

nf_conntrack_h323_types.h

…

nf_conntrack_h323.h

netfilter: nf_nat: add protoff argument to packet mangling functions

2012-08-30 03:00:13 +02:00

nf_conntrack_irc.h

netfilter: nf_nat: add protoff argument to packet mangling functions

2012-08-30 03:00:13 +02:00

nf_conntrack_pptp.h

netfilter: nf_nat: add protoff argument to packet mangling functions

2012-08-30 03:00:13 +02:00

nf_conntrack_proto_gre.h

…

nf_conntrack_sane.h

…

nf_conntrack_sip.h

netfilter: nf_ct_sip: support Cisco 7941/7945 IP phones

2013-01-17 21:12:44 +01:00

nf_conntrack_snmp.h

…

nf_conntrack_tcp.h

UAPI: (Scripted) Disintegrate include/linux/netfilter

2012-10-09 09:48:54 +01:00

nf_conntrack_tftp.h

…

nfnetlink_acct.h

UAPI: (Scripted) Disintegrate include/linux/netfilter

2012-10-09 09:48:54 +01:00

nfnetlink.h

netfilter: nfnetlink: add mutex per subsystem

2013-02-05 04:07:35 +01:00

x_tables.h

UAPI: (Scripted) Disintegrate include/linux/netfilter

2012-10-09 09:48:54 +01:00

xt_hashlimit.h

UAPI: (Scripted) Disintegrate include/linux/netfilter

2012-10-09 09:48:54 +01:00

xt_HMARK.h

…

xt_physdev.h

UAPI: (Scripted) Disintegrate include/linux/netfilter

2012-10-09 09:48:54 +01:00

xt_rpfilter.h

…