tree c2572c4362e4ceaa7bfc6b2d6136d22026d37c40
parent 290b774a1e0cb385658ba117452e2a2962323b1f
parent 63c43787d35e45562a6b5927e2edc8f4783d95b8
author David S. Miller <davem@davemloft.net> 1474527383 -0400
committer David S. Miller <davem@davemloft.net> 1474527383 -0400

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

Steffen Klassert says:

====================
pull request (net): ipsec 2016-09-21

1) Propagate errors on security context allocation.
   From Mathias Krause.

2) Fix inbound policy checks for inter address family tunnels.
   From Thomas Zeitlhofer.

3) Fix an old memory leak on aead algorithm usage.
   From Ilan Tayari.

4) A recent patch fixed a possible NULL pointer dereference
   but broke the vti6 input path.
   Fix from Nicolas Dichtel.
====================

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