]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Jun 2017 02:20:08 +0000 (22:20 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Jun 2017 02:20:08 +0000 (22:20 -0400)
commit5702197a323cfdd24d5fc58cf2b8b63665f5b90d
treea43daec41b4d3955e7a4f8d0ed0654a7c80527ec
parent3e0e3ff93a1d3ce898cd05fcbdcf73b32295349c
parent6a12f43f1bb3e2ef0f275181b3ce9fa8b2f88d70
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 <davem@davemloft.net>
29 files changed:
MAINTAINERS
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/qp.c
drivers/net/dsa/mv88e6xxx/global2.h
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/i40e/i40e_txrx.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/qlogic/qed/qed_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/phy/mdio_bus.c
drivers/net/phy/micrel.c
drivers/net/phy/phy.c
drivers/net/virtio_net.c
drivers/scsi/qedi/qedi_fw.c
drivers/scsi/qedi/qedi_iscsi.c
drivers/scsi/qedi/qedi_main.c
include/linux/mlx5/mlx5_ifc.h
include/net/tcp.h
net/bridge/br_netlink.c
net/bridge/br_stp_if.c
net/core/skbuff.c
net/dsa/dsa.c
net/dsa/dsa2.c
net/dsa/legacy.c
net/ipv4/tcp.c
net/mpls/af_mpls.c