diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-23 01:11:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-23 01:11:50 -0800 |
| commit | ff98263a746108a5e54b7176f106ace5225c5f58 (patch) | |
| tree | 48aeaa6622d53defd1d58db3b49e77c37b983051 /crypto/testmgr.h | |
| parent | 6d6414ab5683801f479e1fb0c379f438d7756066 (diff) | |
| parent | c24d856ab6af7c070faf98f3e4db107d5f5e0568 (diff) | |
| download | linux-crypto-ff98263a746108a5e54b7176f106ace5225c5f58.tar.gz linux-crypto-ff98263a746108a5e54b7176f106ace5225c5f58.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"The last push broke algif_hash for all shash implementations, so this
is a follow-up to fix that.
This also fixes a problem in the crypto scatterwalk that triggers a
BUG_ON with certain debugging options due to the new vmalloced-stack
code"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: scatterwalk - Remove unnecessary aliasing check in map_and_copy
crypto: algif_hash - Fix result clobbering in recvmsg
Diffstat (limited to 'crypto/testmgr.h')
0 files changed, 0 insertions, 0 deletions