projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a9cd343 fa89a45)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Thu, 20 Dec 2018 16:21:47 +0000 (08:21 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Dec 2018 16:21:47 +0000 (08:21 -0800)
commitac68a3d3c3eba61c693d63a89223e1df8fe1f0c6
treea22c1d9403987da5517b888dfa1906bced8de07etree | snapshot
parenta9cd3439e3c6d777a05c63b4d06c3500d1d4074ecommit | diff
parentfa89a4593b927b3f59c3b69379f31d3b22272e4ecommit | diff
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 <davem@davemloft.net>
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
John Crispins staging tree