David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ...

The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

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

2018-08-02 10:55:32 -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

xfrm: don't check offload_handle for nonzero

2018-07-19 10:18:04 +02:00

xfrm_hash.c

…

xfrm_hash.h

…

xfrm_input.c

xfrm: Add virtual xfrm interfaces

2018-06-23 16:07:25 +02:00

xfrm_interface.c

xfrm: fix ptr_ret.cocci warnings

2018-07-27 06:47:28 +02:00

xfrm_ipcomp.c

…

xfrm_output.c

xfrm: Extend the output_mark to support input direction and masking.

2018-06-23 16:06:57 +02:00

xfrm_policy.c

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

2018-08-02 10:55:32 -07:00

xfrm_proc.c

…

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

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

2018-08-02 10:55:32 -07:00