Jakub Kicinski 2295cddf99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Minor conflicts in net/mptcp/protocol.h and tools/testing/selftests/net/Makefile. In both cases code was added on both sides in the same place so just keep both. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-10-15 12:43:21 -07:00
..
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile
tls_device.c	net/tls: sendfile fails with ktls offload	2020-10-09 16:42:02 -07:00
tls_device_fallback.c
tls_main.c	net/tls: use semicolons rather than commas to separate statements	2020-10-13 17:11:52 -07:00
tls_proc.c	net/tls: Fix unused function warning	2019-11-15 12:12:28 -08:00
tls_sw.c	net/tls: race causes kernel panic	2020-09-24 20:06:29 -07:00
tls_toe.c
trace.c
trace.h