From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jan 2023 19:14:11 +0000 (-0800)
Subject: Merge tag 'v6.2-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v6.6.17~5809
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90bc52c525fdac4ed8cbf13c08c813ec2a4fc856;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v6.2-p2' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a CFI crash in arm64/sm4 as well as a regression in the
  caam driver"

* tag 'v6.2-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: arm64/sm4 - fix possible crash with CFI enabled
  crypto: caam - fix CAAM io mem access in blob_gen
---

90bc52c525fdac4ed8cbf13c08c813ec2a4fc856