From: David S. Miller <davem@davemloft.net>
Date: Fri, 5 Jul 2019 22:01:15 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e3b60ffbc16feeb007d07b2b7d1da4304e98c1a3;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next

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>
---

e3b60ffbc16feeb007d07b2b7d1da4304e98c1a3