Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/team/team.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
Simple merge

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc fs/cifs/cifsfs.c
Simple merge

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/cifs/smb2pdu.c
Simple merge

diff --cc kernel/audit.c
Simple merge

diff --cc net/bridge/br_if.c
Simple merge

diff --cc net/bridge/br_netlink.c
Simple merge

diff --cc net/core/datagram.c
Simple merge

diff --cc net/core/dev.c
Simple merge

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

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/netfilter/nf_conntrack_expect.c
index cb29e598605f5e6c22961c007bf23291fab0bbaa,d80073037856db9081e57b7c88e482a61b94a45f..a5ca5e426bae2aca4e543320fffd1d608f2fff2b
--- 1/net/netfilter/nf_conntrack_expect.c
--- 2/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@@ -361,9 -361,9 +361,9 @@@ static void nf_ct_expect_insert(struct 
        unsigned int h = nf_ct_expect_dst_hash(net, &exp->tuple);
  
        /* two references : one for hash insert, one for the timer */
 -      atomic_add(2, &exp->use);
 +      refcount_add(2, &exp->use);
  
-       hlist_add_head(&exp->lnode, &master_help->expectations);
+       hlist_add_head_rcu(&exp->lnode, &master_help->expectations);
        master_help->expecting[exp->class]++;
  
        hlist_add_head_rcu(&exp->hnode, &nf_ct_expect_hash[h]);

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

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

diff --cc net/sched/sch_generic.c
index 3e64d23e098cff218eea7ea0371302a535e6935c,1a2f9e964330a5cd0c0b9a5cac91807221b0ffd9..52a2c55f6d9eb29ec1de3135596fe5a1529ebf23
--- 1/net/sched/sch_generic.c
--- 2/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@@ -794,8 -794,8 +794,8 @@@ static void attach_default_qdiscs(struc
                }
        }
  #ifdef CONFIG_NET_SCHED
-       if (dev->qdisc)
+       if (dev->qdisc != &noop_qdisc)
 -              qdisc_hash_add(dev->qdisc);
 +              qdisc_hash_add(dev->qdisc, false);
  #endif
  }
  

diff --cc net/sctp/socket.c
Simple merge