Hi Linus: This push fixes a number of crashes triggered by a previous crypto self-test update. It also fixes a build problem in the caam driver, as well as a concurrency issue in s390. Finally there is a pair of fixes to bugs in the crypto scatterwalk code and authenc that may lead to crashes. 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 Gerald Schaefer (1): crypto: s390 - Fix aes-xts parameter corruption Horia Geanta (5): crypto: talitos - corrrectly handle zero-length assoc data crypto: ccm - Fix handling of zero plaintext when computing mac crypto: caam - fix aead sglen for case 'dst != src' crypto: talitos - fix aead sglen for case 'dst != src' crypto: testmgr - fix sglen in test_aead for case 'dst != src' Michael Neuling (1): crypto: caam - Add missing Job Ring include Tom Lendacky (2): crypto: authenc - Find proper IV address in ablkcipher callback crypto: scatterwalk - Set the chain pointer indication bit arch/s390/crypto/aes_s390.c | 31 ++++++++++-------- crypto/authenc.c | 7 ++-- crypto/ccm.c | 3 +- crypto/tcrypt.c | 4 ++ crypto/testmgr.c | 26 +++++++-------- drivers/crypto/caam/caamalg.c | 51 +++++++++++++++++------------- drivers/crypto/caam/jr.c | 1 + drivers/crypto/talitos.c | 68 +++++++++++++++++++++++----------------- include/crypto/scatterwalk.h | 1 + 9 files changed, 109 insertions(+), 83 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