From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 May 2019 19:24:24 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.2-rc2~26
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d53e860fd46f3d95c437bb67518f7374500de467;p=linux-2.6-block.git

Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:

 - Two long-standing bugs in the powerpc assembly of vmx

 - Stack overrun caused by HASH_MAX_DESCSIZE being too small

 - Regression in caam

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: vmx - ghash: do nosimd fallback manually
  crypto: vmx - CTR: always increment IV as quadword
  crypto: hash - fix incorrect HASH_MAX_DESCSIZE
  crypto: caam - fix typo in i.MX6 devices list for errata
---

d53e860fd46f3d95c437bb67518f7374500de467