diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-29 20:17:08 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-29 20:17:08 +0300 |
commit | 75c7a6c1ca63131875fe869cbfd404c94d0e1944 (patch) | |
tree | fcebb8da572f838853d0b2ca17f49bba14553626 /net/unix/unix_bpf.c | |
parent | 2c04d67ec1eb558c9d0f58d61e64554d8f39f120 (diff) | |
parent | f8690a4b5a1b64f74ae5c4f7c4ea880d8a8e1a0d (diff) | |
download | linux-75c7a6c1ca63131875fe869cbfd404c94d0e1944.tar.xz |
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
Diffstat (limited to 'net/unix/unix_bpf.c')
0 files changed, 0 insertions, 0 deletions