android_kernel_xiaomi_sm8450/net/xfrm
Greg Kroah-Hartman 1f77f18bb8 Merge a45ad71e89 ("Merge tag 'rproc-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc") into android-mainline
Another "small" merge point to handle conflicts in a sane way.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5dc2f5f11275b29f3c9b5b8d4dd59864ceb6faf9
2020-02-08 13:32:37 +01:00
..
espintcp.c xfrm: add espintcp (RFC 8229) 2019-12-09 09:59:07 +01:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next 2019-11-25 20:02:57 -08:00
Makefile xfrm: add espintcp (RFC 8229) 2019-12-09 09:59:07 +01:00
xfrm_algo.c Linux 5.5-rc1 2019-12-09 12:12:00 +01:00
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 mm: remove include/linux/bootmem.h 2018-10-31 08:54:16 -07:00
xfrm_hash.h xfrm: use complete IPv6 addresses for hash 2018-10-15 10:09:18 +02:00
xfrm_inout.h xfrm: remove input2 indirection from xfrm_mode 2019-04-08 09:14:55 +02:00
xfrm_input.c xfrm: introduce xfrm_trans_queue_net 2019-12-09 09:59:07 +01:00
xfrm_interface.c xfrm: interface: do not confirm neighbor when do pmtu update 2020-01-14 08:55:38 +01:00
xfrm_ipcomp.c net: Use skb_frag_off accessors 2019-07-30 14:21:32 -07:00
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 treewide: remove redundant IS_ERR() before error code check 2020-02-04 03:05:27 +00: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 Merge bd2463ac7d ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-common 2020-01-31 08:22:22 +01:00
xfrm_sysctl.c License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
xfrm_user.c ANDROID: xfrm: remove in_compat_syscall() checks 2019-07-25 17:12:52 -07:00