From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Apr 2025 03:59:42 +0000 (-0700)
Subject: Merge tag 'v6.15-p6' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v6.15-rc5~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6ea1680d0ac0e45157a819c41b46565f4616186;p=thirdparty%2Flinux.git

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

Pull crypto fix from Herbert Xu:
 "This fixes a regression in scompress"

* tag 'v6.15-p6' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: scompress - increment scomp_scratch_users when already allocated
---

b6ea1680d0ac0e45157a819c41b46565f4616186