David S. Miller 71930d6102 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... All conflicts seemed rather trivial, with some guidance from Saeed Mameed on the tc_ct.c one. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-07-11 00:46:00 -07:00
..
espintcp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	2020-06-19 13:03:47 -07:00
Makefile	xfrm: add IPv6 support for espintcp	2020-04-28 11:28:36 +02:00
xfrm_algo.c	crypto: skcipher - remove the "blkcipher" algorithm type	2019-11-01 13:38:32 +08:00
xfrm_device.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-06-25 19:29:51 -07:00
xfrm_hash.c
xfrm_hash.h
xfrm_inout.h	xfrm: move xfrm4_extract_header to common helper	2020-05-06 09:40:08 +02:00
xfrm_input.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
xfrm_interface.c	net: xfrmi: implement header_ops->parse_protocol for AF_PACKET	2020-06-30 12:29:39 -07:00
xfrm_ipcomp.c	net: Use skb_frag_off accessors	2019-07-30 14:21:32 -07:00
xfrm_output.c	xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo"	2020-06-05 08:10:08 +02:00
xfrm_policy.c	xfrm: fix a warning in xfrm_policy_insert_list	2020-05-25 16:04:12 +02:00
xfrm_proc.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
xfrm_replay.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 335	2019-06-05 17:37:06 +02:00
xfrm_state.c	xfrm: Use kmem_cache_zalloc() instead of kmem_cache_alloc() with flag GFP_ZERO.	2020-02-19 09:33:56 +01:00
xfrm_sysctl.c
xfrm_user.c	xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire	2020-02-12 11:06:32 +01:00