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

Version bump conflict in batman-adv, take what's in net-next.

iavf conflict, adjustment of netdev_ops in net-next conflicting
with poll controller method removal in net.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
Simple merge

diff --cc drivers/net/ethernet/ibm/emac/core.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
index 8c71c69,fef6d89..9f2b7b7
--- 1/drivers/net/ethernet/intel/iavf/iavf_main.c
--- 2/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@@ -390,34 -393,11 +390,11 @@@ static void iavf_map_rings_to_vectors(s
                        vidx = 0;
        }
  
 -      adapter->aq_required |= I40EVF_FLAG_AQ_MAP_VECTORS;
 +      adapter->aq_required |= IAVF_FLAG_AQ_MAP_VECTORS;
  }
  
- #ifdef CONFIG_NET_POLL_CONTROLLER
- /**
-  * iavf_netpoll - A Polling 'interrupt' handler
-  * @netdev: network interface device structure
-  *
-  * This is used by netconsole to send skbs without having to re-enable
-  * interrupts.  It's not called while the normal interrupt routine is executing.
-  **/
- static void iavf_netpoll(struct net_device *netdev)
- {
-       struct iavf_adapter *adapter = netdev_priv(netdev);
-       int q_vectors = adapter->num_msix_vectors - NONQ_VECS;
-       int i;
- 
-       /* if interface is down do nothing */
-       if (test_bit(__IAVF_VSI_DOWN, adapter->vsi.state))
-               return;
- 
-       for (i = 0; i < q_vectors; i++)
-               iavf_msix_clean_rings(0, &adapter->q_vectors[i]);
- }
- 
- #endif
  /**
 - * i40evf_irq_affinity_notify - Callback for affinity changes
 + * iavf_irq_affinity_notify - Callback for affinity changes
   * @notify: context as to what irq was changed
   * @mask: the new affinity mask
   *
@@@ -3213,24 -3192,21 +3190,21 @@@ static netdev_features_t iavf_fix_featu
        return features;
  }
  
 -static const struct net_device_ops i40evf_netdev_ops = {
 -      .ndo_open               = i40evf_open,
 -      .ndo_stop               = i40evf_close,
 -      .ndo_start_xmit         = i40evf_xmit_frame,
 -      .ndo_set_rx_mode        = i40evf_set_rx_mode,
 +static const struct net_device_ops iavf_netdev_ops = {
 +      .ndo_open               = iavf_open,
 +      .ndo_stop               = iavf_close,
 +      .ndo_start_xmit         = iavf_xmit_frame,
 +      .ndo_set_rx_mode        = iavf_set_rx_mode,
        .ndo_validate_addr      = eth_validate_addr,
 -      .ndo_set_mac_address    = i40evf_set_mac,
 -      .ndo_change_mtu         = i40evf_change_mtu,
 -      .ndo_tx_timeout         = i40evf_tx_timeout,
 -      .ndo_vlan_rx_add_vid    = i40evf_vlan_rx_add_vid,
 -      .ndo_vlan_rx_kill_vid   = i40evf_vlan_rx_kill_vid,
 -      .ndo_features_check     = i40evf_features_check,
 -      .ndo_fix_features       = i40evf_fix_features,
 -      .ndo_set_features       = i40evf_set_features,
 -      .ndo_setup_tc           = i40evf_setup_tc,
 +      .ndo_set_mac_address    = iavf_set_mac,
 +      .ndo_change_mtu         = iavf_change_mtu,
 +      .ndo_tx_timeout         = iavf_tx_timeout,
 +      .ndo_vlan_rx_add_vid    = iavf_vlan_rx_add_vid,
 +      .ndo_vlan_rx_kill_vid   = iavf_vlan_rx_kill_vid,
 +      .ndo_features_check     = iavf_features_check,
 +      .ndo_fix_features       = iavf_fix_features,
 +      .ndo_set_features       = iavf_set_features,
- #ifdef CONFIG_NET_POLL_CONTROLLER
-       .ndo_poll_controller    = iavf_netpoll,
- #endif
 +      .ndo_setup_tc           = iavf_setup_tc,
  };
  
  /**

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgb/ixgb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/nfp_net_common.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_dcbx.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_dev.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_hsi.h
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/ethernet/renesas/ravb.h
Simple merge

diff --cc drivers/net/ethernet/renesas/ravb_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

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

diff --cc net/batman-adv/soft-interface.c
Simple merge

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

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

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