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

Just some simple overlapping changes in marvell PHY driver
and the DSA core code.

Signed-off-by: David S. Miller <[email protected]>

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/net/dsa/mv88e6xxx/global2.h
Simple merge

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

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

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

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

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

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

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

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

diff --cc drivers/net/phy/mdio_bus.c
Simple merge

diff --cc drivers/net/phy/micrel.c
Simple merge

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

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

diff --cc drivers/scsi/qedi/qedi_fw.c
Simple merge

diff --cc drivers/scsi/qedi/qedi_iscsi.c
Simple merge

diff --cc drivers/scsi/qedi/qedi_main.c
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge

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

diff --cc net/bridge/br_netlink.c
Simple merge

diff --cc net/bridge/br_stp_if.c
Simple merge

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

diff --cc net/dsa/dsa.c
Simple merge

diff --cc net/dsa/dsa2.c
index cd13bb54a30c10040f196ae3b6f5d88a565b4153,7796580e99ee2c57cdd5503130c8ec2e121d879a..f88e1dddb74a7409e73c1d9310308965a1e3d973
--- 1/net/dsa/dsa2.c
--- 2/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@@ -474,8 -484,10 +474,10 @@@ static void dsa_dst_unapply(struct dsa_
                dsa_ds_unapply(dst, ds);
        }
  
-       if (dst->cpu_dp)
 -      if (dst->cpu_switch) {
 -              dsa_cpu_port_ethtool_restore(dst->cpu_switch);
 -              dst->cpu_switch = NULL;
++      if (dst->cpu_dp) {
 +              dsa_cpu_port_ethtool_restore(dst->cpu_dp);
++              dst->cpu_dp = NULL;
+       }
  
        pr_info("DSA: tree %d unapplied\n", dst->tree);
        dst->applied = false;

diff --cc net/dsa/legacy.c
Simple merge

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

diff --cc net/mpls/af_mpls.c
Simple merge