David S. Miller a658a3f2ec 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 2019-04-30 1) A lot of work to remove indirections from the xfrm code. From Florian Westphal. 2) Support ESP offload in combination with gso partial. From Boris Pismenny. 3) Remove some duplicated code from vti4. From Jeremy Sowden. Please note that there is merge conflict between commit: 8742dc86d0 ("xfrm4: Fix uninitialized memory read in _decode_session4") from the ipsec tree and commit: c53ac41e37 ("xfrm: remove decode_session indirection from afinfo_policy") from the ipsec-next tree. The merge conflict will appear when those trees get merged during the merge window. The conflict can be solved as it is done in linux-next: https://lkml.org/lkml/2019/4/25/1207 Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-30 09:26:13 -04:00
..
Kconfig	xfrm: kconfig: make xfrm depend on inet	2019-04-15 11:09:20 +02:00
Makefile
xfrm_algo.c
xfrm_device.c	xfrm: store xfrm_mode directly, not its address	2019-04-08 09:15:28 +02:00
xfrm_hash.c
xfrm_hash.h
xfrm_inout.h	xfrm: remove input2 indirection from xfrm_mode	2019-04-08 09:14:55 +02:00
xfrm_input.c	xfrm: store xfrm_mode directly, not its address	2019-04-08 09:15:28 +02:00
xfrm_interface.c	xfrm: store xfrm_mode directly, not its address	2019-04-08 09:15:28 +02:00
xfrm_ipcomp.c
xfrm_output.c	xfrm: store xfrm_mode directly, not its address	2019-04-08 09:15:28 +02:00
xfrm_policy.c	xfrm: remove decode_session indirection from afinfo_policy	2019-04-23 07:42:20 +02:00
xfrm_proc.c
xfrm_replay.c
xfrm_state.c	xfrm: remove unneeded export_symbols	2019-04-23 07:42:20 +02:00
xfrm_sysctl.c
xfrm_user.c	netlink: make validation more configurable for future strictness	2019-04-27 17:07:21 -04:00