David S. Miller b2d6cee117 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The bpf syscall and selftests conflicts were trivial overlapping changes. The r8169 change involved moving the added mdelay from 'net' into a different function. A TLS close bug fix overlapped with the splitting of the TLS state into separate TX and RX parts. I just expanded the tests in the bug fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf == X". Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-11 20:53:22 -04:00
..
Kconfig	hv_netvsc: select needed ucs2_string routine	2018-04-22 21:07:03 -04:00
Makefile	hv_netvsc: add trace points	2018-03-17 20:10:27 -04:00
hyperv_net.h	hv_netvsc: typo in NDIS RSS parameters structure	2018-05-10 17:23:20 -04:00
netvsc.c	hv_netvsc: simplify receive side calling arguments	2018-04-27 14:46:26 -04:00
netvsc_drv.c	hv_netvsc: set master device	2018-05-10 17:36:20 -04:00
netvsc_trace.c	hv_netvsc: add trace points	2018-03-17 20:10:27 -04:00
netvsc_trace.h	hv_netvsc: add trace points	2018-03-17 20:10:27 -04:00
rndis_filter.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00