From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Jul 2013 18:05:18 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: MMI-PSA29.97-13-9~13952
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge git://git./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
---

b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73
diff --cc crypto/Makefile
index 2d5ed08a239f,a8e9b0fefbe9..2ba0df2f908f
--- a/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