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 | 23aabe73d53c29ee8da71397f87f190bdcde5b68 (patch) | |
| tree | 05a0365d3a344cd5f66caa26d4734248beedd741 /arch/arm | |
| parent | 23400ac997062647f2b63c82030d189671b1effe (diff) | |
| parent | c8467f7a3620698bf3c22f0e199b550fb611a8ae (diff) | |
| download | linux-23aabe73d53c29ee8da71397f87f190bdcde5b68.tar.gz linux-23aabe73d53c29ee8da71397f87f190bdcde5b68.tar.bz2 linux-23aabe73d53c29ee8da71397f87f190bdcde5b68.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 'arch/arm')
0 files changed, 0 insertions, 0 deletions