David S. Miller 6026e043d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Three cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-09-01 17:42:05 -07: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

xfrm: fix xfrm_dev_event() missing when compile without CONFIG_XFRM_OFFLOAD

2017-06-07 08:16:27 +02: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

net: xfrm: support setting an output mark.

2017-08-11 07:03:00 +02:00

xfrm_hash.c

net: allow GFP_HIGHMEM in __vmalloc()

2010-11-21 10:04:04 -08:00

xfrm_hash.h

xfrm: use "unsigned int" in __xfrm6_pref_hash()

2017-03-24 07:03:12 +01:00

xfrm_input.c

xfrm: Add support for network devices capable of removing the ESP trailer

2017-08-31 09:04:03 +02: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: xfrm: support setting an output mark.

2017-08-11 07:03:00 +02:00

xfrm_policy.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-09-01 17:42:05 -07: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: Add xfrm_replay_overflow functions for offloading

2017-04-14 10:07:01 +02:00

xfrm_state.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-09-01 17:42:05 -07:00

xfrm_sysctl.c

net: xfrm: Change u32 sysctl entries to use proc_douintvec

2016-09-07 23:17:53 -07:00

xfrm_user.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-09-01 17:42:05 -07:00