From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Dec 2020 17:14:32 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: baikal/mips/sdk5.9~11863
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=83475630b8df12d9d98d301305a49d25d6a830cb;p=kernel.git

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

Pull crypto fixes from Herbert Xu:
 "Fix a number of autobuild failures due to missing Kconfig
  dependencies"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: qat - add CRYPTO_AES to Kconfig dependencies
  crypto: keembay - Add dependency on HAS_IOMEM
  crypto: keembay - CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 should depend on ARCH_KEEMBAY
---

83475630b8df12d9d98d301305a49d25d6a830cb