David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
Kconfig	xfrm: prefer secpath_set over secpath_dup	2018-12-19 11:21:38 -08:00
Makefile
xfrm_algo.c
xfrm_device.c	net: use skb_sec_path helper in more places	2018-12-19 11:21:37 -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_input.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
xfrm_interface.c	xfrm: use secpath_exist where applicable	2018-12-19 11:21:37 -08:00
xfrm_ipcomp.c
xfrm_output.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
xfrm_policy.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2018-12-20 08:21:47 -08:00
xfrm_proc.c
xfrm_replay.c
xfrm_state.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	2018-12-18 11:43:26 -08:00
xfrm_sysctl.c
xfrm_user.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	2018-12-18 11:43:26 -08:00