From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 Nov 2012 20:25:55 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Tag: firefly_0821_release~3680^2~1480^2~244
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=242a18d1374cebacd301f6b0ce1fd70d6c5afee6;p=firefly-linux-kernel-4.4.55.git

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

Steffen Klassert says:

====================
This pull request is intended for net-next and contains the following changes:

1) Remove a redundant check when initializing the xfrm replay functions,
   from Ulrich Weber.
2) Use a faster per-cpu helper when allocating ipcomt transforms,
   from Shan Wei.
3) Use a static gc threshold value for ipv6, simmilar to what we do
   for ipv4 now.
4) Remove a commented out function call.
====================

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

242a18d1374cebacd301f6b0ce1fd70d6c5afee6