Merge tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Mar 2024 17:48:23 +0000 (10:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Mar 2024 17:48:23 +0000 (10:48 -0700)
commit174fdc93a241af54772ae3e745ec719e9f6cebfc
treeafdc8399f4a17c763966e0dc25b671af24570485
parent4cece764965020c22cff7665b18a012006359095
parent5a7e89d3315d1be86aff8a8bf849023cda6547f7
Merge tag 'v6.9-p2' of git://git./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"
kernel/module/Kconfig