From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Sep 2021 14:37:46 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.15-rc4~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e439bbd436e39f15abc9587cdd23d56257780cb;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This contains fixes for a resource leak in ccp as well as stack
  corruption in x86/sm4"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/sm4 - Fix frame pointer stack corruption
  crypto: ccp - fix resource leaks in ccp_run_aes_gcm_cmd()
---

6e439bbd436e39f15abc9587cdd23d56257780cb