From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Nov 2016 19:15:45 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.9-rc6~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=384b0dc4c84eb0ffe04589694a31a06226d61f7a;p=karo-tx-linux.git

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

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - Compiler warning in caam driver that was the last one remaining

   - Do not register aes-xts in caam drivers on unsupported platforms

   - Regression in algif_hash interface that may lead to an oops"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algif_hash - Fix NULL hash crash with shash
  crypto: caam - fix type mismatch warning
  crypto: caam - do not register AES-XTS mode on LP units
---

384b0dc4c84eb0ffe04589694a31a06226d61f7a