Hi Linus: This push fixes a build problem in sahara and temporarily disables two new optimisations because of performance regressions until a permanent fix is ready. Please pull from git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git or master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git Arnd Bergmann (1): crypto: sahara - fix building as module Jussi Kivilinna (2): crypto: twofish - disable AVX2 implementation crypto: blowfish - disable AVX2 implementation crypto/Kconfig | 2 ++ drivers/crypto/sahara.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) Thanks, -- Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html