AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-19 20:46:50 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
c0f9c7e45d
linux_dsm_epyc7002/drivers/net/ethernet/cavium
History
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
..
liquidio drivers/net: get rid of unnecessary initializations in .get_drvinfo() 2015-10-16 00:24:10 -07:00
thunder net: thunderx: Support for internal loopback mode 2015-08-30 21:54:12 -07:00
Kconfig net: cavium: change NET_VENDOR_CAVIUM to bool 2015-10-21 19:12:16 -07:00
Makefile Add support of Cavium Liquidio ethernet adapters 2015-06-10 22:44:08 -07:00