From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Oct 2025 16:38:31 +0000 (-0700)
Subject: Merge tag 'v6.18-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7c8dcac8d72da94328f4de7bf98320b75710da1f;p=users%2Fhch%2Fmisc.git

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

Pull crypto fixes from Herbert Xu:

 - Fix zstd regression

 - Ensure ti driver algorithm are set as async

 - Revert patch disabling SHA1 in FIPS mode

 - Fix RNG set_ent null-pointer dereference

* tag 'v6.18-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: rng - Ensure set_ent is always present
  Revert "crypto: testmgr - desupport SHA-1 for FIPS 140"
  crypto: ti - Add CRYPTO_ALG_ASYNC flag to DTHEv2 AES algos
  crypto: zstd - Fix compression bug caused by truncation
---

7c8dcac8d72da94328f4de7bf98320b75710da1f