]> www.infradead.org Git - users/hch/block.git/commitdiff
projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cece76 5a7e89d)
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)
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"

1  2 
kernel/module/Kconfig patch | diff1 | diff2 | blob | history

diff --cc kernel/module/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.