From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Feb 2020 22:17:39 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.10.7~3225
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64ae1342f8980d05c3df414a022b8123aa76c56b;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull crypto fix from Herbert Xu:
 "This fixes a Kconfig anomaly when lib/crypto is enabled without Crypto
  API"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: Kconfig - allow tests to be disabled when manager is disabled
---

64ae1342f8980d05c3df414a022b8123aa76c56b