]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Aug 2021 01:42:09 +0000 (15:42 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Aug 2021 01:42:09 +0000 (15:42 -1000)
Pull crypto fix from Herbert Xu:
 "This contains a fix for a potential boot failure due to a missing
  Kconfig dependency for people upgrading with the DRBG enabled"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: drbg - select SHA512


Trivial merge