tree ff20664482e00197f455cec70f450310fab8d78c
parent 120e47686a00144ef1195cfc137645d1bed46d23
parent 8a6b8f4d7a891ac66db4f97900a86b55c84a5802
author Linus Torvalds <torvalds@linux-foundation.org> 1575336201 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1575336201 -0800

Merge branch 'linus' of git://git.kernel.org/pub/scm/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