These patches fix a log target regression in 2.6.22, causing failures to
load ipt_LOG/ ipt_ULOG when the other one is already loaded and clean
up a couple of duplicate includes. I'll send the regression fix to -stable
once its upstream.
Please apply, thanks.
net/bridge/netfilter/ebt_log.c | 7 ++-----
net/bridge/netfilter/ebt_ulog.c | 9 ++-------
net/ipv4/netfilter/ipt_LOG.c | 6 ++----
net/ipv6/netfilter/ip6t_LOG.c | 6 ++----
net/netfilter/nf_conntrack_proto_tcp.c | 1 -
net/netfilter/nf_conntrack_proto_udp.c | 1 -
net/netfilter/nf_conntrack_proto_udplite.c | 1 -
net/netfilter/xt_physdev.c | 1 -
8 files changed, 8 insertions(+), 24 deletions(-)
Jesper Juhl (2):
[NETFILTER]: Clean up duplicate includes in net/bridge/
[NETFILTER]: Clean up duplicate includes in net/netfilter/
Patrick McHardy (1):
[NETFILTER]: Fix logging regression
load ipt_LOG/ ipt_ULOG when the other one is already loaded and clean
up a couple of duplicate includes. I'll send the regression fix to -stable
once its upstream.
Please apply, thanks.
net/bridge/netfilter/ebt_log.c | 7 ++-----
net/bridge/netfilter/ebt_ulog.c | 9 ++-------
net/ipv4/netfilter/ipt_LOG.c | 6 ++----
net/ipv6/netfilter/ip6t_LOG.c | 6 ++----
net/netfilter/nf_conntrack_proto_tcp.c | 1 -
net/netfilter/nf_conntrack_proto_udp.c | 1 -
net/netfilter/nf_conntrack_proto_udplite.c | 1 -
net/netfilter/xt_physdev.c | 1 -
8 files changed, 8 insertions(+), 24 deletions(-)
Jesper Juhl (2):
[NETFILTER]: Clean up duplicate includes in net/bridge/
[NETFILTER]: Clean up duplicate includes in net/netfilter/
Patrick McHardy (1):
[NETFILTER]: Fix logging regression