From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Nov 2013 00:18:25 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=26b265cd29dde56bf0901c421eabc7ae815f38c4;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:
 - Made x86 ablk_helper generic for ARM
 - Phase out chainiv in favour of eseqiv (affects IPsec)
 - Fixed aes-cbc IV corruption on s390
 - Added constant-time crypto_memneq which replaces memcmp
 - Fixed aes-ctr in omap-aes
 - Added OMAP3 ROM RNG support
 - Add PRNG support for MSM SoC's
 - Add and use Job Ring API in caam
 - Misc fixes

[ NOTE! This pull request was sent within the merge window, but Herbert
  has some questionable email sending setup that makes him public enemy
  #1 as far as gmail is concerned.  So most of his emails seem to be
  trapped by gmail as spam, resulting in me not seeing them.  - Linus ]

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (49 commits)
  crypto: s390 - Fix aes-cbc IV corruption
  crypto: omap-aes - Fix CTR mode counter length
  crypto: omap-sham - Add missing modalias
  padata: make the sequence counter an atomic_t
  crypto: caam - Modify the interface layers to use JR API's
  crypto: caam - Add API's to allocate/free Job Rings
  crypto: caam - Add Platform driver for Job Ring
  hwrng: msm - Add PRNG support for MSM SoC's
  ARM: DT: msm: Add Qualcomm's PRNG driver binding document
  crypto: skcipher - Use eseqiv even on UP machines
  crypto: talitos - Simplify key parsing
  crypto: picoxcell - Simplify and harden key parsing
  crypto: ixp4xx - Simplify and harden key parsing
  crypto: authencesn - Simplify key parsing
  crypto: authenc - Export key parsing helper function
  crypto: mv_cesa: remove deprecated IRQF_DISABLED
  hwrng: OMAP3 ROM Random Number Generator support
  crypto: sha256_ssse3 - also test for BMI2
  crypto: mv_cesa - Remove redundant of_match_ptr
  crypto: sahara - Remove redundant of_match_ptr
  ...
---

26b265cd29dde56bf0901c421eabc7ae815f38c4
diff --cc crypto/Makefile
index b3a7e807e08b,d6a401c58d17..989c510da8cc
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@@ -104,4 -109,4 +109,5 @@@ obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) 
  obj-$(CONFIG_XOR_BLOCKS) += xor.o
  obj-$(CONFIG_ASYNC_CORE) += async_tx/
  obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
 +obj-$(CONFIG_CRYPTO_HASH_INFO) += hash_info.o
+ obj-$(CONFIG_CRYPTO_ABLK_HELPER) += ablk_helper.o
diff --cc drivers/crypto/caam/jr.c
index bdb786d5a5e5,636bb53125ab..d23356d20e1c
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@@ -405,7 -480,7 +482,7 @@@ static int caam_jr_probe(struct platfor
  		dma_set_mask(jrdev, DMA_BIT_MASK(32));
  
  	/* Identify the interrupt */
- 	jrpriv->irq = irq_of_parse_and_map(np, 0);
 -	jrpriv->irq = of_irq_to_resource(nprop, 0, NULL);
++	jrpriv->irq = irq_of_parse_and_map(nprop, 0);
  
  	/* Now do the platform independent part */
  	error = caam_jr_init(jrdev); /* now turn on hardware */