Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2019-07-05

1) A lot of work to remove indirections from the xfrm code.
   From Florian Westphal.

2) Fix a WARN_ON with ipv6 that triggered because of a
   forgotten break statement. From Florian Westphal.

3)  Remove xfrmi_init_net, it is not needed.
    From Li RongQing.

Please pull or let me know if there are problems.
====================

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

diff --cc net/ipv4/esp4_offload.c
Simple merge

diff --cc net/ipv4/ipcomp.c
Simple merge

diff --cc net/ipv6/esp6_offload.c
Simple merge

diff --cc net/xfrm/xfrm_device.c
Simple merge