Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

diff --cc include/linux/netfilter/nf_conntrack_tcp.h
Simple merge

diff --cc net/ipv4/netfilter/ip_queue.c
index 884f0859cb3b42e11e6714a634180aaf622b884f,9f078709195100e9bc94f48021f71e32b9a3af9a..49ad44712f46fbb49bf2903938ffa3ddbe302cfd
--- 1/net/ipv4/netfilter/ip_queue.c
--- 2/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@@ -497,10 -497,9 +497,9 @@@ ipq_rcv_nl_event(struct notifier_block 
  {
        struct netlink_notify *n = ptr;
  
-       if (event == NETLINK_URELEASE &&
-           n->protocol == NETLINK_FIREWALL && n->pid) {
+       if (event == NETLINK_URELEASE && n->protocol == NETLINK_FIREWALL) {
                write_lock_bh(&queue_lock);
 -              if ((n->net == &init_net) && (n->pid == peer_pid))
 +              if ((net_eq(n->net, &init_net)) && (n->pid == peer_pid))
                        __ipq_reset();
                write_unlock_bh(&queue_lock);
        }

diff --cc net/ipv4/netfilter/nf_nat_helper.c
Simple merge

diff --cc net/ipv6/netfilter/ip6_queue.c
index 4c7a18abcaff5a329262e9ca4dc1b934b22668a4,47a3623e71193770402270b315681dcdb6c3c567..db4d5725cce8c252ecb0b47e23b82b12fde5f112
--- 1/net/ipv6/netfilter/ip6_queue.c
--- 2/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@@ -499,10 -499,9 +499,9 @@@ ipq_rcv_nl_event(struct notifier_block 
  {
        struct netlink_notify *n = ptr;
  
-       if (event == NETLINK_URELEASE &&
-           n->protocol == NETLINK_IP6_FW && n->pid) {
+       if (event == NETLINK_URELEASE && n->protocol == NETLINK_IP6_FW) {
                write_lock_bh(&queue_lock);
 -              if ((n->net == &init_net) && (n->pid == peer_pid))
 +              if ((net_eq(n->net, &init_net)) && (n->pid == peer_pid))
                        __ipq_reset();
                write_unlock_bh(&queue_lock);
        }

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto_tcp.c
Simple merge

diff --cc net/netfilter/nfnetlink_log.c
Simple merge