From: David S. Miller Date: Wed, 23 Jan 2013 19:00:16 +0000 (-0500) Subject: Merge branch 'testing' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert... X-Git-Tag: firefly_0821_release~3680^2~1092^2~270 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=93b9c1ddd3fb4a5b67d512e534b30070f9ecec28;p=firefly-linux-kernel-4.4.55.git Merge branch 'testing' of git://git./linux/kernel/git/klassert/ipsec-next Steffen Klassert says: ==================== 1) Add a statistic counter for invalid output states and remove a superfluous state valid check, from Li RongQing. 2) Probe for asynchronous block ciphers instead of synchronous block ciphers to make the asynchronous variants available even if no synchronous block ciphers are found, from Jussi Kivilinna. 3) Make rfc3686 asynchronous block cipher and make use of the new asynchronous variant, from Jussi Kivilinna. 4) Replace some rwlocks by rcu, from Cong Wang. 5) Remove some unused defines. ==================== Signed-off-by: David S. Miller --- 93b9c1ddd3fb4a5b67d512e534b30070f9ecec28