tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
"This push fixes a build problem with img-hash under non-standard
configurations and a serious regression with sha512_ssse3 which can
lead to boot failures"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA
crypto: x86/sha512_ssse3 - fixup for asm function prototype change

Linus Torvalds d89b3e19 78d42567

+3 -2
+1 -1
arch/x86/crypto/sha512-avx2-asm.S
··· 79 79 c = %rcx 80 80 d = %r8 81 81 e = %rdx 82 - y3 = %rdi 82 + y3 = %rsi 83 83 84 84 TBL = %rbp 85 85
+2 -1
drivers/crypto/Kconfig
··· 446 446 source "drivers/crypto/vmx/Kconfig" 447 447 448 448 config CRYPTO_DEV_IMGTEC_HASH 449 - depends on MIPS || COMPILE_TEST 450 449 tristate "Imagination Technologies hardware hash accelerator" 450 + depends on MIPS || COMPILE_TEST 451 + depends on HAS_DMA 451 452 select CRYPTO_ALGAPI 452 453 select CRYPTO_MD5 453 454 select CRYPTO_SHA1