AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-22 22:39:20 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
e7358f54a3
linux_dsm_epyc7002/drivers/net/ethernet/emulex/benet
History
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
be_cmds.c be2net: remove vlan promisc capability from VF's profile descriptors 2015-10-13 04:32:45 -07:00
be_cmds.h be2net: set pci_func_num while issuing GET_PROFILE_CONFIG cmd 2015-10-13 04:32:44 -07:00
be_ethtool.c drivers/net: get rid of unnecessary initializations in .get_drvinfo() 2015-10-16 00:24:10 -07:00
be_hw.h be2net: update copyright year to 2015 2015-05-09 16:27:04 -04:00
be_main.c be2net: set pci_func_num while issuing GET_PROFILE_CONFIG cmd 2015-10-13 04:32:44 -07:00
be_roce.c be2net: update copyright year to 2015 2015-05-09 16:27:04 -04:00
be_roce.h be2net: update copyright year to 2015 2015-05-09 16:27:04 -04:00
be.h be2net: set pci_func_num while issuing GET_PROFILE_CONFIG cmd 2015-10-13 04:32:44 -07:00
Kconfig be2net: make hwmon interface optional 2015-05-19 16:40:04 -04:00
Makefile