diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-28 16:22:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-28 16:22:10 -0800 |
| commit | f05d33aa7fd00bfc54a2320012bf280ab3a9d562 (patch) | |
| tree | 1a718dd72951ba21804de8d1977bc3658e537f96 /crypto/Makefile | |
| parent | 65cb3654889e0b748abc7756260ca267705aee14 (diff) | |
| parent | 0eb81f6835b0ab06fac3d2906e2094d92774ce9e (diff) | |
| download | linux-crypto-f05d33aa7fd00bfc54a2320012bf280ab3a9d562.tar.gz linux-crypto-f05d33aa7fd00bfc54a2320012bf280ab3a9d562.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- avoid potential bogus alignment for some AEAD operations
- fix crash in algif_aead
- avoid sleeping in softirq context with async af_alg
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: skcipher - Fix skcipher_walk_aead_common
crypto: af_alg - remove locking in async callback
crypto: algif_aead - skip SGL entries with NULL page
Diffstat (limited to 'crypto/Makefile')
0 files changed, 0 insertions, 0 deletions