git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Wed, 7 Jun 2017 02:20:08 +0000 (22:20 -0400)
committer	David S. Miller <davem@davemloft.net>
	Wed, 7 Jun 2017 02:20:08 +0000 (22:20 -0400)
commit	216fe8f021e33c36e3b27c49c9f1951f6b037d7f
tree	a43daec41b4d3955e7a4f8d0ed0654a7c80527ec	tree \| snapshot
parent	9747e2313838ee8f5d8073fd6aa7289255c3c51b	commit \| diff
parent	b29794ec95c6856b316c2295904208bf11ffddd9	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/global2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mdio_bus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_iscsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_stp_if.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa.c	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa2.c	diff1 \|	diff2 \|	blob \| history
net/dsa/legacy.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/mpls/af_mpls.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/mv88e6xxx/global2.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qed/qed_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/mdio_bus.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_fw.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_iscsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/qedi/qedi_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history
include/net/tcp.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_stp_if.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa.c	diff1 \|	diff2 \|	blob \| history
net/dsa/dsa2.c	diff1 \|	diff2 \|	blob \| history
net/dsa/legacy.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/mpls/af_mpls.c	diff1 \|	diff2 \|	blob \| history