Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net...

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

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

diff --cc net/netfilter/nf_conntrack_proto_dccp.c
index 6b08d32,aee0d6b..1b816a2
--- 1/net/netfilter/nf_conntrack_proto_dccp.c
--- 2/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@@ -22,8 -22,11 +22,9 @@@
  #include <linux/netfilter/nfnetlink_conntrack.h>
  #include <net/netfilter/nf_conntrack.h>
  #include <net/netfilter/nf_conntrack_l4proto.h>
+ #include <net/netfilter/nf_conntrack_ecache.h>
  #include <net/netfilter/nf_log.h>
  
 -static DEFINE_RWLOCK(dccp_lock);
 -
  /* Timeouts are based on values from RFC4340:
   *
   * - REQUEST:
@@@ -549,8 -552,11 +550,11 @@@ static int dccp_packet(struct nf_conn *
        ct->proto.dccp.last_dir = dir;
        ct->proto.dccp.last_pkt = type;
        ct->proto.dccp.state = new_state;
 -      write_unlock_bh(&dccp_lock);
 +      spin_unlock_bh(&ct->lock);
  
+       if (new_state != old_state)
+               nf_conntrack_event_cache(IPCT_PROTOINFO, ct);
+ 
        dn = dccp_pernet(net);
        nf_ct_refresh_acct(ct, ctinfo, skb, dn->dccp_timeout[new_state]);
  

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

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