AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-16 19:56:28 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
b38da40190
linux_dsm_epyc7002/drivers/net/ethernet/chelsio/cxgb4vf
History
David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	drivers/net/usb/sr9800.c
	drivers/net/usb/usbnet.c
	include/linux/usb/usbnet.h
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

The TCP conflicts were overlapping changes.  In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.

With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-02 16:16:53 -04:00
..
adapter.h cxgb4vf: Fix ethtool get_settings for VF driver 2014-12-22 16:35:28 -05:00
cxgb4vf_main.c cxgb4/cxgb4vf/csiostor: Make PCI Device ID Tables be "const" 2015-03-19 15:30:21 -04:00
Makefile
sge.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00
t4vf_common.h cxgb4vf: Fix ethtool get_settings for VF driver 2014-12-22 16:35:28 -05:00
t4vf_defs.h cxgb4/cxg4vf/csiostor: Cleanup MC, MA and CIM related register defines 2015-01-05 16:34:47 -05:00
t4vf_hw.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-04-02 16:16:53 -04:00