From: David S. Miller <davem@davemloft.net>
Date: Fri, 1 Sep 2017 16:57:04 +0000 (-0700)
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=08daaec742d170eabe7f8355c2f86fc8be166f10;p=linux.git

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

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2017-09-01

This should be the last ipsec-next pull request for this
release cycle:

1) Support netdevice ESP trailer removal when decryption
   is offloaded. From Yossi Kuperman.

2) Fix overwritten return value of copy_sec_ctx().

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

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

08daaec742d170eabe7f8355c2f86fc8be166f10