David S. Miller 9f6e055907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The mptcp conflict was overlapping additions. The SMC conflict was an additional and removal happening at the same time. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-02-27 18:31:39 -08:00
..
bitset.c	ethtool: limit bitset size	2020-02-26 11:27:31 -08:00
bitset.h	ethtool: limit bitset size	2020-02-26 11:27:31 -08:00
common.c	ethtool: Add support for low latency RS FEC	2020-02-18 19:17:31 -08:00
common.h	ethtool: provide WoL settings with WOL_GET request	2020-01-27 11:31:36 +01:00
debug.c	ethtool: add DEBUG_NTF notification	2020-01-27 11:31:36 +01:00
ioctl.c	net/core: Replace driver version to be kernel version	2020-01-27 13:47:22 +01:00
linkinfo.c	ethtool: add LINKINFO_NTF notification	2019-12-27 16:40:02 -08:00
linkmodes.c	ethtool: Add support for low latency RS FEC	2020-02-18 19:17:31 -08:00
linkstate.c	ethtool: provide link state with LINKSTATE_GET request	2019-12-27 16:40:02 -08:00
Makefile	ethtool: provide WoL settings with WOL_GET request	2020-01-27 11:31:36 +01:00
netlink.c	ethtool: add WOL_NTF notification	2020-01-27 11:31:36 +01:00
netlink.h	ethtool: set wake-on-lan settings with WOL_SET request	2020-01-27 11:31:36 +01:00
strset.c	ethtool: provide WoL settings with WOL_GET request	2020-01-27 11:31:36 +01:00
wol.c	ethtool: add WOL_NTF notification	2020-01-27 11:31:36 +01:00