Jakub Kicinski 5c39f26e67 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflict in CAN, keep the net-next + the byteswap wrapper. Conflicts: drivers/net/can/usb/gs_usb.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-11-27 18:25:27 -08:00
..
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	net/tls: add skeleton of MIB statistics	2019-10-05 16:29:00 -07:00
tls_device.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-27 18:25:27 -08:00
tls_device_fallback.c	net/tls: make inline helpers protocol-aware	2020-11-27 14:32:37 -08:00
tls_main.c	net/tls: add CHACHA20-POLY1305 configuration	2020-11-27 14:32:37 -08:00
tls_proc.c	net/tls: Fix unused function warning	2019-11-15 12:12:28 -08:00
tls_sw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-27 18:25:27 -08: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