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

Three trivial overlapping conflicts.

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

2019-05-02 22:14:21 -04:00

..

Kconfig

xfrm: kconfig: make xfrm depend on inet

2019-04-15 11:09:20 +02:00

Makefile

xfrm: Add virtual xfrm interfaces

2018-06-23 16:07:25 +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

xfrm: store xfrm_mode directly, not its address

2019-04-08 09:15:28 +02: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: store xfrm_mode directly, not its address

2019-04-08 09:15:28 +02:00

xfrm_interface.c

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

2019-05-02 22:14:21 -04:00

xfrm_ipcomp.c

net: xfrm: use preempt-safe this_cpu_read() in ipcomp_alloc_tfms()

2018-03-13 07:46:37 +01:00

xfrm_output.c

xfrm: store xfrm_mode directly, not its address

2019-04-08 09:15:28 +02:00

xfrm_policy.c

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

2019-05-02 22:14:21 -04:00

xfrm_proc.c

proc: introduce proc_create_net_single

2018-05-16 07:24:30 +02:00

xfrm_replay.c

xfrm: Fix ESN sequence number handling for IPsec GSO packets.

2018-03-01 08:14:50 +01:00

xfrm_state.c

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

2019-05-02 22:14:21 -04: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

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

2019-05-02 22:14:21 -04:00