tree dd91e94be214adbf1cb9ba77252dfad4423ec316
parent 3b07d7884ca203d14297974df1b89bed7ff20a8c
parent 9b7e14dba0c087e950fc024b486e8f729c1ee672
author David S. Miller <davem@davemloft.net> 1513354227 -0500
committer David S. Miller <davem@davemloft.net> 1513354227 -0500

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

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2017-12-15

1) Currently we can add or update socket policies, but
   not clear them. Support clearing of socket policies
   too. From Lorenzo Colitti.

2) Add documentation for the xfrm device offload api.
   From Shannon Nelson.

3) Fix IPsec extended sequence numbers (ESN) for
   IPsec offloading. From Yossef Efraim.

4) xfrm_dev_state_add function returns success even for
   unsupported options, fix this to fail in such cases.
   From Yossef Efraim.

5) Remove a redundant xfrm_state assignment.
   From Aviv Heller.

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

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