David S. Miller 3ab0a7a0c3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Two minor conflicts: 1) net/ipv4/route.c, adding a new local variable while moving another local variable and removing it's initial assignment. 2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes. One pretty prints the port mode differently, whilst another changes the driver to try and obtain the port mode from the port node rather than the switch node. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-09-22 16:45:34 -07:00
..
Makefile	ethtool: add tunnel info interface	2020-07-10 13:54:00 -07:00
bitset.c	ethtool: add ethnl_parse_bitset() helper	2020-03-12 15:32:32 -07:00
bitset.h	ethtool: add ethnl_parse_bitset() helper	2020-03-12 15:32:32 -07:00
cabletest.c	net: ethtool: Remove PHYLIB direct dependency	2020-07-07 15:41:05 -07:00
channels.c	xsk: i40e: ice: ixgbe: mlx5: Rename xsk zero-copy driver interfaces	2020-08-31 21:15:04 +02:00
coalesce.c	ethtool: add COALESCE_NTF notification	2020-03-29 22:32:36 -07:00
common.c	ethtool: Add 100base-FX link mode entries	2020-09-19 16:54:35 -07:00
common.h	ethtool: add tunnel info interface	2020-07-10 13:54:00 -07:00
debug.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-03-25 18:58:11 -07:00
eee.c	ethtool: add EEE_NTF notification	2020-03-29 22:32:36 -07:00
features.c	ethtool: Don't omit the netlink reply if no features were changed	2020-08-18 16:00:24 -07:00
ioctl.c	ethtool: fix error handling in ethtool_phys_id	2020-09-03 14:59:51 -07:00
linkinfo.c	ethtool: linkinfo: remove an unnecessary NULL check	2020-06-05 13:10:02 -07:00
linkmodes.c	ethtool: Add 100base-FX link mode entries	2020-09-19 16:54:35 -07:00
linkstate.c	ethtool: Add link extended state	2020-06-29 17:45:02 -07:00
netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-11 00:46:00 -07:00
netlink.h	ethtool: add tunnel info interface	2020-07-10 13:54:00 -07:00
pause.c	ethtool: add standard pause stats	2020-09-15 13:26:28 -07:00
privflags.c	ethtool: fix reference leak in ethnl_set_privflags()	2020-03-29 22:32:36 -07:00
rings.c	ethtool: fix spelling mistake "exceeeds" -> "exceeds"	2020-03-13 11:23:33 -07:00
strset.c	ethtool: add tunnel info interface	2020-07-10 13:54:00 -07:00
tsinfo.c	ethtool: provide timestamping information with TSINFO_GET request	2020-03-29 22:32:37 -07:00
tunnels.c	ethtool: add and use message type for tunnel info reply	2020-09-17 16:43:20 -07:00
wol.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-03-25 18:58:11 -07:00