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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/boot/dts/apm/apm-storm.dtsi
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/cm.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/device.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

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

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

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 1be4d235a576ddee4f7223af594df0d854429fae,3ceafb55d6da704a3c235012877f6a12bb54dfdd..eaa7fa98a205f308aa4e03c668b125cfcec7e908
--- 1/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
--- 2/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@@ -3971,12 -4305,29 +3971,19 @@@ static const struct pci_error_handlers 
        .resume         = eeh_resume,
  };
  
+ /* Return true if the Link Configuration supports "High Speeds" (those greater
+  * than 1Gb/s).
+  */
  static inline bool is_x_10g_port(const struct link_config *lc)
  {
-       return (lc->supported & FW_PORT_CAP_SPEED_10G) != 0 ||
-              (lc->supported & FW_PORT_CAP_SPEED_40G) != 0;
+       unsigned int speeds, high_speeds;
+ 
+       speeds = FW_PORT_CAP_SPEED_V(FW_PORT_CAP_SPEED_G(lc->supported));
+       high_speeds = speeds & ~(FW_PORT_CAP_SPEED_100M | FW_PORT_CAP_SPEED_1G);
+ 
+       return high_speeds != 0;
  }
  
 -static inline void init_rspq(struct adapter *adap, struct sge_rspq *q,
 -                           unsigned int us, unsigned int cnt,
 -                           unsigned int size, unsigned int iqe_size)
 -{
 -      q->adap = adap;
 -      cxgb4_set_rspq_intr_params(q, us, cnt);
 -      q->iqe_len = iqe_size;
 -      q->size = size;
 -}
 -
  /*
   * Perform default configuration of DMA queues depending on the number and type
   * of ports we found and the number of available CPUs.  Most settings can be

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/t4vf_common.h
Simple merge

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

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

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

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

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

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

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

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

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

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

diff --cc drivers/net/xen-netback/xenbus.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/net/xfrm.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc net/batman-adv/routing.c
Simple merge

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

diff --cc net/ipv4/route.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/ip6_vti.c
Simple merge

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

diff --cc net/irda/af_irda.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/xfrm/xfrm_state.c
Simple merge