diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-19 11:15:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-19 11:15:45 -0800 |
| commit | 6d6414ab5683801f479e1fb0c379f438d7756066 (patch) | |
| tree | 991f951929b7cc9b297fd4062fc9dfd73d0ef411 /crypto/authenc.c | |
| parent | d6c7f8ac7b17995a9ec714e55d70d9f337eeac61 (diff) | |
| parent | 19db05fdfca2b8b655b9d6d7a93387c1dc0d1fd5 (diff) | |
| download | linux-crypto-6d6414ab5683801f479e1fb0c379f438d7756066.tar.gz linux-crypto-6d6414ab5683801f479e1fb0c379f438d7756066.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the following issues:
- Compiler warning in caam driver that was the last one remaining
- Do not register aes-xts in caam drivers on unsupported platforms
- Regression in algif_hash interface that may lead to an oops"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: algif_hash - Fix NULL hash crash with shash
crypto: caam - fix type mismatch warning
crypto: caam - do not register AES-XTS mode on LP units
Diffstat (limited to 'crypto/authenc.c')
0 files changed, 0 insertions, 0 deletions