Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2021 17:17:08 +0000 (10:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2021 17:17:08 +0000 (10:17 -0700)
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


Trivial merge