From: David S. Miller Date: Tue, 29 Aug 2017 16:37:06 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec X-Git-Tag: MMI-PSA29.97-13-9~4879^2~16 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=04f1c4ad7299470bc4738a2ec563eb6adc0caa08;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec Steffen Klassert says: ==================== pull request (net): ipsec 2017-08-29 1) Fix dst_entry refcount imbalance when using socket policies. From Lorenzo Colitti. 2) Fix locking when adding the ESP trailers. 3) Fix tailroom calculation for the ESP trailer by using skb_tailroom instead of skb_availroom. 4) Fix some info leaks in xfrm_user. From Mathias Krause. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller --- 04f1c4ad7299470bc4738a2ec563eb6adc0caa08