From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Feb 2022 17:53:56 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: howlett/maple/20220722_2~1226
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f9f94c9d2c070941a5688f0f751a489c7d0e5039;p=users%2Fjedix%2Flinux-maple.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 two regressions:

   - Potential boot failure due to missing cryptomgr on initramfs

   - Stack overflow in octeontx2"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: api - Move cryptomgr soft dependency into algapi
  crypto: octeontx2 - Avoid stack variable overflow
---

f9f94c9d2c070941a5688f0f751a489c7d0e5039