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	net/tls: Add generic NIC offload infrastructure	2018-05-01 09:42:47 -04:00
Makefile	net/tls: Add generic NIC offload infrastructure	2018-05-01 09:42:47 -04:00
tls_device.c	tls: Fix tls_device initialization	2018-05-10 17:54:20 -04:00
tls_device_fallback.c	net/tls: Add generic NIC offload infrastructure	2018-05-01 09:42:47 -04:00
tls_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00
tls_sw.c	net/tls: Split conf to rx + tx	2018-05-01 09:42:47 -04:00