Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
authorDavid S. Miller <davem@davemloft.net>
Mon, 9 Oct 2017 16:43:34 +0000 (09:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Oct 2017 16:43:34 +0000 (09:43 -0700)
commit93b03193c6a579dbe5e19139d1ab47b70dbeeebd
treefafe769e2780bdc76bf815893cf07fd647f8389f
parent6c0e7284d89995877740d8a26c3e99a937312a3c
parentdd269db84908d4d3f7c0efed85bf9d8939fb0b9b
Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
pull request (net): ipsec 2017-10-09

1) Fix some error paths of the IPsec offloading API.

2) Fix a NULL pointer dereference when IPsec is used
   with vti. From Alexey Kodanev.

3) Don't call xfrm_policy_cache_flush under xfrm_state_lock,
   it triggers several locking warnings. From Artem Savkov.

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

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