David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-06 18:44:57 -07:00
..
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
tls_device.c	net: Use skb_frag_off accessors	2019-07-30 14:21:32 -07:00
tls_device_fallback.c	net: Use skb_frag_off accessors	2019-07-30 14:21:32 -07:00
tls_main.c	net/tls: partially revert fix transition through disconnect with close	2019-08-05 13:15:30 -07:00
tls_sw.c	net/tls: remove sock unlock/lock around strp_done()	2019-07-22 16:04:16 +02:00