David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
Kconfig	net/tls: allow compiling TLS TOE out	2019-10-04 14:07:07 -07:00
Makefile	net/tls: add skeleton of MIB statistics	2019-10-05 16:29:00 -07:00
tls_device_fallback.c	net: Use skb_frag_off accessors	2019-07-30 14:21:32 -07:00
tls_device.c	net/tls: Add force_resync for driver resync	2020-05-27 15:07:13 -07:00
tls_main.c	net/tls: fix const assignment warning	2020-04-08 14:34:02 -07:00
tls_proc.c	net/tls: Fix unused function warning	2019-11-15 12:12:28 -08:00
tls_sw.c	net/tls: fix race condition causing kernel panic	2020-05-25 17:41:40 -07:00
tls_toe.c	net/tls: rename tls_hw_* functions tls_toe_*	2019-10-04 14:07:07 -07:00
trace.c	net/tls: add tracing for device/offload events	2019-10-05 16:29:00 -07:00
trace.h	net/tls: add device decrypted trace point	2019-10-05 16:29:00 -07:00