David S. Miller 4f2c17e0f3 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ... Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2020-01-21 1) Add support for TCP encapsulation of IKE and ESP messages, as defined by RFC 8229. Patchset from Sabrina Dubroca. Please note that there is a merge conflict in: net/unix/af_unix.c between commit: 3c32da19a8 ("unix: Show number of pending scm files of receive queue in fdinfo") from the net-next tree and commit: b50b0580d2 ("net: add queue argument to __skb_wait_for_more_packets and __skb_{,try_}recv_datagram") from the ipsec-next tree. The conflict can be solved as done in linux-next. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2020-01-21 12:18:20 +01:00
..
espintcp.c	xfrm: add espintcp (RFC 8229)	2019-12-09 09:59:07 +01:00
Kconfig
Makefile	xfrm: add espintcp (RFC 8229)	2019-12-09 09:59:07 +01:00
xfrm_algo.c
xfrm_device.c	net: xfrm: use skb_list_walk_safe helper for gso segments	2020-01-14 11:48:41 -08:00
xfrm_hash.c
xfrm_hash.h
xfrm_inout.h
xfrm_input.c
xfrm_interface.c
xfrm_ipcomp.c
xfrm_output.c	net: xfrm: use skb_list_walk_safe helper for gso segments	2020-01-14 11:48:41 -08:00
xfrm_policy.c	xfrm: add espintcp (RFC 8229)	2019-12-09 09:59:07 +01:00
xfrm_proc.c
xfrm_replay.c
xfrm_state.c	xfrm: add espintcp (RFC 8229)	2019-12-09 09:59:07 +01:00
xfrm_sysctl.c
xfrm_user.c