diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 11:05:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-24 11:05:18 -0700 |
| commit | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (patch) | |
| tree | c5b9258be43d7f4e2ec1d91e4b83820562fbaebb /lib/Kconfig | |
| parent | 04012e3076943f17c8cfc77a196701c8f0b8964f (diff) | |
| parent | e70308ec0e4bff344fcfdf160de40e1150552c5f (diff) | |
| download | op-kernel-dev-b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73.zip op-kernel-dev-b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes a memory corruption issue in caam, as well as
reverting the new optimised crct10dif implementation as it breaks boot
on initrd systems.
Hopefully crct10dif will be reinstated once the supporting code is
added so that it doesn't break boot"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
crypto: caam - Fixed the memory out of bound overwrite issue
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 35da513..71d9f81 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -66,8 +66,6 @@ config CRC16 config CRC_T10DIF tristate "CRC calculation for the T10 Data Integrity Field" - select CRYPTO - select CRYPTO_CRCT10DIF help This option is only needed if a module that's not in the kernel tree needs to calculate CRC checks for use with the |
