linux_dsm_epyc7002/drivers/net/ethernet/amd/xgbe
David S. Miller ba3e2084f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/ipv6/xfrm6_output.c
	net/openvswitch/flow_netlink.c
	net/openvswitch/vport-gre.c
	net/openvswitch/vport-vxlan.c
	net/openvswitch/vport.c
	net/openvswitch/vport.h

The openvswitch conflicts were overlapping changes.  One was
the egress tunnel info fix in 'net' and the other was the
vport ->send() op simplification in 'net-next'.

The xfrm6_output.c conflicts was also a simplification
overlapping a bug fix.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-24 06:54:12 -07:00
..
Makefile amd-xgbe: Add traffic class support 2014-07-30 18:46:53 -07:00
xgbe-common.h amd-xgbe: Move the PHY support into amd-xgbe 2015-05-15 15:21:43 -04:00
xgbe-dcb.c amd-xgbe: Add netif_* message support to the driver 2015-05-15 15:21:43 -04:00
xgbe-debugfs.c amd-xgbe: Check for successful buffer allocation before use 2015-10-05 23:30:51 -07:00
xgbe-desc.c amd-xgbe: Fix DMA API debug warning 2015-07-08 15:57:14 -07:00
xgbe-dev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-24 06:54:12 -07:00
xgbe-drv.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-24 06:54:12 -07:00
xgbe-ethtool.c drivers/net: get rid of unnecessary initializations in .get_drvinfo() 2015-10-16 00:24:10 -07:00
xgbe-main.c amd-xgbe: Use proper DT / ACPI precedence checking 2015-10-05 03:23:22 -07:00
xgbe-mdio.c amd-xgbe: Remove the XGBE_LINK state bit 2015-10-05 03:23:27 -07:00
xgbe-ptp.c ptp: xgbe: convert to the 64 bit get/set time methods. 2015-03-31 12:01:16 -04:00
xgbe.h amd-xgbe: Remove the XGBE_LINK state bit 2015-10-05 03:23:27 -07:00