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)
commit75c7a6c1ca63131875fe869cbfd404c94d0e1944
treefcebb8da572f838853d0b2ca17f49bba14553626
parent2c04d67ec1eb558c9d0f58d61e64554d8f39f120
parentf8690a4b5a1b64f74ae5c4f7c4ea880d8a8e1a0d
Merge branch 'linus' of git://git./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