From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Mar 2024 17:48:23 +0000 (-0700)
Subject: Merge tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=174fdc93a241af54772ae3e745ec719e9f6cebfc;p=people%2Faperard%2Flinux.git

Merge tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a regression that broke iwd as well as a divide by zero in
  iaa"

* tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: iaa - Fix nr_cpus < nr_iaa case
  Revert "crypto: pkcs7 - remove sha1 support"
---

174fdc93a241af54772ae3e745ec719e9f6cebfc