David S. Miller 71930d6102 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

All conflicts seemed rather trivial, with some guidance from
Saeed Mameed on the tc_ct.c one.

Signed-off-by: David S. Miller <davem@davemloft.net>

2020-07-11 00:46: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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2020-05-22 18:30:34 -07:00

coalesce.c

ethtool: add COALESCE_NTF notification

2020-03-29 22:32:36 -07:00

common.c

ethtool: add tunnel info interface

2020-07-10 13:54:00 -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: add FEATURES_NTF notification

2020-03-12 15:32:33 -07:00

ioctl.c

net: phy: Uninline PHY ethtool statistics operations

2020-07-08 12:39:05 -07:00

linkinfo.c

ethtool: linkinfo: remove an unnecessary NULL check

2020-06-05 13:10:02 -07:00

linkmodes.c

ethtool: Add support for 100Gbps per lane link modes

2020-07-08 15:30:42 -07:00

linkstate.c

ethtool: Add link extended state

2020-06-29 17:45:02 -07:00

Makefile

ethtool: add tunnel info interface

2020-07-10 13:54:00 -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 PAUSE_NTF notification

2020-03-29 22:32:36 -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 tunnel info interface

2020-07-10 13:54:00 -07:00

wol.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-03-25 18:58:11 -07:00