Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IPoIB: Don't turn on carrier for a non-active port
  IB/mthca: Fix access to freed memory in catastrophic event handling
  mlx4_core: Pass cache line size to device FW
  RDMA/nes: Remove duplicate .ndo_set_mac_address field initialization
  IB/mad: Fix lock-lock-timer deadlock in RMPP code

diff --combined drivers/infiniband/hw/nes/nes_nic.c
index 538e409d451528f3c3faa62976b5c79e2879c042,0bfa2546569f51a7c33231e706fee197f9feb133..e593af3354b8013f3f9ac1e6897e34440b0dbf4f
--- 1/drivers/infiniband/hw/nes/nes_nic.c
--- 2/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@@ -1508,7 -1508,7 +1508,7 @@@ static int nes_netdev_set_settings(stru
  }
  
  
 -static struct ethtool_ops nes_ethtool_ops = {
 +static const struct ethtool_ops nes_ethtool_ops = {
        .get_link = ethtool_op_get_link,
        .get_settings = nes_netdev_get_settings,
        .set_settings = nes_netdev_set_settings,
@@@ -1566,7 -1566,6 +1566,6 @@@ static const struct net_device_ops nes_
        .ndo_set_mac_address    = nes_netdev_set_mac_address,
        .ndo_set_multicast_list = nes_netdev_set_multicast_list,
        .ndo_change_mtu         = nes_netdev_change_mtu,
-       .ndo_set_mac_address    = eth_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
        .ndo_vlan_rx_register   = nes_netdev_vlan_rx_register,
  };