summaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-11-28 04:21:48 +0300
committerDavid S. Miller <davem@davemloft.net>2016-11-28 04:21:48 +0300
commit8eb4adf60b8a2e0857643910c01aac98fe613466 (patch)
tree9ceb2f84e28ab1c94156a88ecc1dbbbef7374c98 /net/tipc
parente824265d632629c3d2583d86b8a816e886a5136c (diff)
parent6b226487815574193c1da864f2eac274781a2b0c (diff)
downloadlinux-8eb4adf60b8a2e0857643910c01aac98fe613466.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says: ==================== pull request (net): ipsec 2016-11-25 1) Fix a refcount leak in vti6. From Nicolas Dichtel. 2) Fix a wrong if statement in xfrm_sk_policy_lookup. From Florian Westphal. 3) The flowcache watermarks are per cpu. Take this into account when comparing to the threshold where we refusing new allocations. From Miroslav Urbanek. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions