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

diff --combined crypto/Kconfig
index 69ce573f1224560b4f5c7532e21053b27c651da4,2754f2bf5d91391a24e87359d44052a419ae0e49..aca01164f00200a8d14efa8a82e4a400b67d0bf1
--- 1/crypto/Kconfig
--- 2/crypto/Kconfig
+++ b/crypto/Kconfig
@@@ -376,25 -376,6 +376,6 @@@ config CRYPTO_CRC32_PCLMU
          which will enable any routine to use the CRC-32-IEEE 802.3 checksum
          and gain better performance as compared with the table implementation.
  
- config CRYPTO_CRCT10DIF
-       tristate "CRCT10DIF algorithm"
-       select CRYPTO_HASH
-       help
-         CRC T10 Data Integrity Field computation is being cast as
-         a crypto transform.  This allows for faster crc t10 diff
-         transforms to be used if they are available.
- 
- config CRYPTO_CRCT10DIF_PCLMUL
-       tristate "CRCT10DIF PCLMULQDQ hardware acceleration"
-       depends on X86 && 64BIT && CRC_T10DIF
-       select CRYPTO_HASH
-       help
-         For x86_64 processors with SSE4.2 and PCLMULQDQ supported,
-         CRC T10 DIF PCLMULQDQ computation can be hardware
-         accelerated PCLMULQDQ instruction. This option will create
-         'crct10dif-plcmul' module, which is faster when computing the
-         crct10dif checksum as compared with the generic table implementation.
- 
  config CRYPTO_GHASH
        tristate "GHASH digest algorithm"
        select CRYPTO_GF128MUL
@@@ -1335,22 -1316,6 +1316,22 @@@ config CRYPTO_84
        select LZO_DECOMPRESS
        help
          This is the 842 algorithm.
 +
 +config CRYPTO_LZ4
 +      tristate "LZ4 compression algorithm"
 +      select CRYPTO_ALGAPI
 +      select LZ4_COMPRESS
 +      select LZ4_DECOMPRESS
 +      help
 +        This is the LZ4 algorithm.
 +
 +config CRYPTO_LZ4HC
 +      tristate "LZ4HC compression algorithm"
 +      select CRYPTO_ALGAPI
 +      select LZ4HC_COMPRESS
 +      select LZ4_DECOMPRESS
 +      help
 +        This is the LZ4 high compression mode algorithm.
  
  comment "Random Number Generation"
  

diff --combined crypto/Makefile
index 2d5ed08a239fa3e79110c9dfd077d30da8954192,a8e9b0fefbe9ba3fc0f43086829e2172c8ba42b0..2ba0df2f908f5985ef23f0794c1f49e6fd5f3720
--- 1/crypto/Makefile
--- 2/crypto/Makefile
+++ b/crypto/Makefile
@@@ -83,11 -83,8 +83,10 @@@ obj-$(CONFIG_CRYPTO_ZLIB) += zlib.
  obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
  obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
  obj-$(CONFIG_CRYPTO_CRC32) += crc32.o
- obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif.o
  obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
  obj-$(CONFIG_CRYPTO_LZO) += lzo.o
 +obj-$(CONFIG_CRYPTO_LZ4) += lz4.o
 +obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o
  obj-$(CONFIG_CRYPTO_842) += 842.o
  obj-$(CONFIG_CRYPTO_RNG2) += rng.o
  obj-$(CONFIG_CRYPTO_RNG2) += krng.o

diff --combined lib/Kconfig
index 35da51359d404180c8214c007195e97ca89563dd,fe01d418b09ae4d13a15b59039ef27602d1ad0f3..71d9f81f6eed17e7623ce9d0b55934acac54358c
--- 1/lib/Kconfig
--- 2/lib/Kconfig
+++ b/lib/Kconfig
@@@ -22,9 -22,6 +22,9 @@@ config GENERIC_STRNCPY_FROM_USE
  config GENERIC_STRNLEN_USER
        bool
  
 +config GENERIC_NET_UTILS
 +      bool
 +
  config GENERIC_FIND_FIRST_BIT
        bool
  
@@@ -66,8 -63,6 +66,6 @@@ config CRC1
  
  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
@@@ -194,15 -189,6 +192,15 @@@ config LZO_COMPRES
  config LZO_DECOMPRESS
        tristate
  
 +config LZ4_COMPRESS
 +      tristate
 +
 +config LZ4HC_COMPRESS
 +      tristate
 +
 +config LZ4_DECOMPRESS
 +      tristate
 +
  source "lib/xz/Kconfig"
  
  #
@@@ -227,10 -213,6 +225,10 @@@ config DECOMPRESS_LZ
        select LZO_DECOMPRESS
        tristate
  
 +config DECOMPRESS_LZ4
 +      select LZ4_DECOMPRESS
 +      tristate
 +
  #
  # Generic allocator support is selected if needed
  #
@@@ -425,6 -407,4 +423,6 @@@ config OID_REGISTR
  config UCS2_STRING
          tristate
  
 +source "lib/fonts/Kconfig"
 +
  endmenu