David S. Miller 6bb8824732 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2017-02-16 21:25:49 -05:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xfrm_algo.c	xfrm: use IS_ENABLED() instead of checking for built-in or module	2016-09-10 21:19:11 -07:00
xfrm_device.c	xfrm: check for xdo_dev_ops add and delete	2017-12-21 08:17:48 +01:00
xfrm_hash.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xfrm_hash.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xfrm_input.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
xfrm_ipcomp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
xfrm_output.c	net: Create and use new helper xfrm_dst_child().	2017-11-30 09:54:25 -05:00
xfrm_policy.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
xfrm_proc.c	proc: Reduce cache miss in xfrm_statistics_seq_show	2016-09-30 01:50:45 -04:00
xfrm_replay.c	xfrm: Fix xfrm_replay_overflow_offload_esn	2017-12-01 07:10:01 +01:00
xfrm_state.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05: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	xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies.	2017-12-08 08:07:25 +01:00