From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Oct 2021 17:17:08 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: Ubuntu-5.15.0-12.12~1541
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=75c7a6c1ca63131875fe869cbfd404c94d0e1944;p=mirror_ubuntu-jammy-kernel.git

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

Pull crypto fix from Herbert Xu:
 "Fix a build-time warning in x86/sm4"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/sm4 - Fix invalid section entry size
---

75c7a6c1ca63131875fe869cbfd404c94d0e1944