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

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc drivers/net/dsa/bcm_sf2.h
Simple merge

diff --cc drivers/net/ethernet/altera/altera_tse_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 51300532ec26306079f75a216dbb98b07b0ce3ed,6befde61c203461a27ac0298d619f4f78b7c366e..84feb241d60b05ad11ede04752f22ed768ecc781
--- 1/drivers/net/ethernet/broadcom/genet/bcmgenet.c
--- 2/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@@ -1688,8 -1720,11 +1718,10 @@@ static void bcmgenet_init_tx_ring(struc
        struct bcmgenet_tx_ring *ring = &priv->tx_rings[index];
        u32 words_per_bd = WORDS_PER_BD(priv);
        u32 flow_period_val = 0;
 -      unsigned int first_bd;
  
        spin_lock_init(&ring->lock);
+       ring->priv = priv;
+       netif_napi_add(priv->dev, &ring->napi, bcmgenet_tx_poll, 64);
        ring->index = index;
        if (index == DESC_INDEX) {
                ring->queue = 0;

diff --cc drivers/net/ethernet/broadcom/genet/bcmgenet.h
Simple merge

diff --cc drivers/net/ethernet/cisco/enic/enic_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_common.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_debugfs.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_nvm.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40evf/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40evf/i40e_txrx.h
Simple merge

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

diff --cc drivers/net/ethernet/rocker/rocker.c
index e5a15a4c4e8ff30eadebcd21b77d8d6c95e0dafc,9fb6948e14c64ef424c032811364aaefc608d4cb..a5d1e6ea7d58428c2a60be1f152e7ce697230bc9
--- 1/drivers/net/ethernet/rocker/rocker.c
--- 2/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@@ -1280,9 -1257,9 +1280,9 @@@ static void rocker_port_set_enable(stru
        u64 val = rocker_read64(rocker_port->rocker, PORT_PHYS_ENABLE);
  
        if (enable)
-               val |= 1 << rocker_port->pport;
 -              val |= 1ULL << rocker_port->lport;
++              val |= 1ULL << rocker_port->pport;
        else
-               val &= ~(1 << rocker_port->pport);
 -              val &= ~(1ULL << rocker_port->lport);
++              val &= ~(1ULL << rocker_port->pport);
        rocker_write64(rocker_port->rocker, PORT_PHYS_ENABLE, val);
  }
  

diff --cc drivers/net/ethernet/xscale/ixp4xx_eth.c
Simple merge

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

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

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

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/vhost/net.c
index 633012cc9a57d19bdcd74bb04c66c2d75191197b,2bbfc25e582cb8b334a1ef4083b22da56c48cc65..18f05bff8826672a17a645d8fddc2a7df489e302
--- 1/drivers/vhost/net.c
--- 2/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@@ -591,13 -591,8 +591,8 @@@ static void handle_rx(struct vhost_net 
                         * TODO: support TSO.
                         */
                        iov_iter_advance(&msg.msg_iter, vhost_hlen);
-               } else {
-                       /* It'll come from socket; we'll need to patch
-                        * ->num_buffers over if VIRTIO_NET_F_MRG_RXBUF
-                        */
-                       iov_iter_advance(&fixup, sizeof(hdr));
                }
 -              err = sock->ops->recvmsg(NULL, sock, &msg,
 +              err = sock->ops->recvmsg(sock, &msg,
                                         sock_len, MSG_DONTWAIT | MSG_TRUNC);
                /* Userspace might have consumed the packet meanwhile:
                 * it's not supposed to do this usually, but might be hard

diff --cc include/linux/netdevice.h
Simple merge

diff --cc net/compat.c
Simple merge

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

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

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

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

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

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

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

diff --cc net/wireless/nl80211.c
Simple merge