From: Linus Torvalds Date: Wed, 24 Sep 2014 16:37:35 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Tag: v4.14-rc1~6799 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2368a9426fe8320e3d23b0584d861ebeb2aa80f2;p=platform%2Fkernel%2Flinux-rpi.git Merge git://git./linux/kernel/git/herbert/crypto-2.6 Pull crypto fixes from Herbert Xu: "This fixes three issues: - if ccp is loaded on a machine without ccp, it will incorrectly activate causing all requests to fail. Fixed by preventing ccp from loading if hardware isn't available. - not all IRQs were enabled for the qat driver, leading to potential stalls when it is used - disabled buggy AVX CTR implementation in aesni" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: aesni - disable "by8" AVX CTR optimization crypto: ccp - Check for CCP before registering crypto algs crypto: qat - Enable all 32 IRQs --- 2368a9426fe8320e3d23b0584d861ebeb2aa80f2