From: David S. Miller Date: Thu, 20 Dec 2018 16:21:47 +0000 (-0800) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ac68a3d3c3eba61c693d63a89223e1df8fe1f0c6;p=linux.git Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec-next Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2018-12-20 Two last patches for this release cycle: 1) Remove an unused variable in xfrm_policy_lookup_bytype(). From YueHaibing. 2) Fix possible infinite loop in __xfrm6_tunnel_alloc_spi(). Also from YueHaibing. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller --- ac68a3d3c3eba61c693d63a89223e1df8fe1f0c6