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

Conflicts:
	drivers/net/usb/asix_common.c
	drivers/net/usb/sr9800.c
	drivers/net/usb/usbnet.c
	include/linux/usb/usbnet.h
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

The TCP conflicts were overlapping changes.  In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.

With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/include/asm/ppc-opcode.h
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/can/usb/kvaser_usb.c
Simple merge

diff --cc drivers/net/can/usb/peak_usb/pcan_usb_fd.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/sge.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/sge.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
Simple merge

diff --cc drivers/net/ethernet/freescale/ucc_geth.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/cmd.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 354e254b53cfcc8b1040e1bfb591b4445fd5e4cc,3485acf03014c7e4df64fa94a770fce00abe5a35..51b20663c2a6182f9c1a6ce7da2731e08a339ff2
--- 1/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
--- 2/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@@ -2963,12 -2844,16 +2956,20 @@@ int mlx4_en_init_netdev(struct mlx4_en_
                queue_delayed_work(mdev->workqueue, &priv->service_task,
                                   SERVICE_TASK_DELAY);
  
 -      mlx4_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);
 +      mlx4_en_set_stats_bitmap(mdev->dev, &priv->stats_bitmap,
 +                               mdev->profile.prof[priv->port].rx_ppp,
 +                               mdev->profile.prof[priv->port].rx_pause,
 +                               mdev->profile.prof[priv->port].tx_ppp,
 +                               mdev->profile.prof[priv->port].tx_pause);
  
+       err = register_netdev(dev);
+       if (err) {
+               en_err(priv, "Netdev registration failed for port %d\n", port);
+               goto out;
+       }
+ 
+       priv->registered = 1;
+ 
        return 0;
  
  out:

diff --cc drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
Simple merge

diff --cc drivers/net/ethernet/rocker/rocker.c
Simple merge

diff --cc drivers/net/ipvlan/ipvlan_core.c
Simple merge

diff --cc drivers/net/ipvlan/ipvlan_main.c
Simple merge

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

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-drv.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/tx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
Simple merge

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

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

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

diff --cc net/ipv4/tcp_ipv4.c
index 5aababa20a212068d7ef5acf74c85ddb3d99f61f,f1756ee022078d12e74be5d245fc1a6a0c1c4a34..69f9cf68474437511306d718ed870908b122bde8
--- 1/net/ipv4/tcp_ipv4.c
--- 2/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@@ -1468,8 -1517,8 +1468,8 @@@ void tcp_v4_early_demux(struct sk_buff 
        if (sk) {
                skb->sk = sk;
                skb->destructor = sock_edemux;
 -              if (sk->sk_state != TCP_TIME_WAIT) {
 +              if (sk_fullsock(sk)) {
-                       struct dst_entry *dst = sk->sk_rx_dst;
+                       struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst);
  
                        if (dst)
                                dst = dst_check(dst, 0);

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

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

diff --cc net/ipv6/tcp_ipv6.c
index 7cdad84014342ac8f19f4aa196d24479b04075eb,1f5e62229aaa8b4d5822f82c3af3a6c8b1382ba6..f73a97f6e68ec8286972fadcf9328e29af123242
--- 1/net/ipv6/tcp_ipv6.c
--- 2/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@@ -1521,8 -1595,8 +1532,8 @@@ static void tcp_v6_early_demux(struct s
        if (sk) {
                skb->sk = sk;
                skb->destructor = sock_edemux;
 -              if (sk->sk_state != TCP_TIME_WAIT) {
 +              if (sk_fullsock(sk)) {
-                       struct dst_entry *dst = sk->sk_rx_dst;
+                       struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst);
  
                        if (dst)
                                dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie);

diff --cc net/iucv/af_iucv.c
Simple merge

diff --cc net/mac80211/agg-rx.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/sta_info.h
Simple merge