David S. Miller 2e2d6f0342 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/sched/cls_api.c has overlapping changes to a call to nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL to the 5th argument, and another (from 'net-next') added cb->extack instead of NULL to the 6th argument. net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to code which moved (to mr_table_dump)) in 'net-next'. Thanks to David Ahern for the heads up. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-10-19 11:03:06 -07:00
..
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2018-07-27 09:33:37 -07:00
Makefile	xfrm: Add virtual xfrm interfaces	2018-06-23 16:07:25 +02:00
xfrm_algo.c
xfrm_device.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2018-10-01 22:31:17 -07:00
xfrm_hash.c
xfrm_hash.h	xfrm: use complete IPv6 addresses for hash	2018-10-15 10:09:18 +02:00
xfrm_input.c	xfrm: use correct size to initialise sp->ovec	2018-10-08 08:15:55 +02:00
xfrm_interface.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-19 11:03:06 -07:00
xfrm_ipcomp.c
xfrm_output.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-03 21:00:17 -07:00
xfrm_policy.c	xfrm: policy: use hlist rcu variants on insert	2018-10-11 13:24:46 +02:00
xfrm_proc.c	proc: introduce proc_create_net_single	2018-05-16 07:24:30 +02:00
xfrm_replay.c
xfrm_state.c	xfrm: Allow xfrmi if_id to be updated by UPDSA	2018-07-20 10:19:19 +02:00
xfrm_sysctl.c
xfrm_user.c	net: Add extack to nlmsg_parse	2018-10-08 10:39:04 -07:00