From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Dec 2019 01:23:21 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: microblaze-v5.6-rc1~74
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=483847a70262f7361f8a6f78513c985c2c8b1719;p=linux-2.6-microblaze.git

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

Pull crypto fixes from Herbert Xu:

 - Fix build error in crypto lib code when crypto API is off

 - Fix NULL/error check in hisilicon

 - Fix Kconfig-related build error in talitos

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: hisilicon - fix a NULL vs IS_ERR() bug in sec_create_qp_ctx()
  crypto: talitos - Fix build error by selecting LIB_DES
  crypto: arch - conditionalize crypto api in arch glue for lib code
---

483847a70262f7361f8a6f78513c985c2c8b1719