Hi Linus: This push fixes a duplicate dma_unmap_sg call in omap-des and reentrancy bugs in the powerpc nx driver which may cause bogus output or worse memory corruption. Please pull from git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git Herbert Xu (1): crypto: nx - Fix reentrancy bugs Vutla, Lokesh (1): crypto: omap-des - Fix unmapping of dma channels drivers/crypto/nx/nx-aes-ccm.c | 6 ++-- drivers/crypto/nx/nx-aes-ctr.c | 7 ++-- drivers/crypto/nx/nx-aes-gcm.c | 17 ++++++---- drivers/crypto/nx/nx-aes-xcbc.c | 70 ++++++++++++++++++++++++--------------- drivers/crypto/nx/nx-sha256.c | 43 +++++++++++++----------- drivers/crypto/nx/nx-sha512.c | 44 +++++++++++++----------- drivers/crypto/nx/nx.c | 3 ++ drivers/crypto/nx/nx.h | 14 ++++++-- drivers/crypto/omap-des.c | 3 -- 9 files changed, 125 insertions(+), 82 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