diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-16 13:37:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-16 13:37:26 -0700 |
| commit | ae5d68be42cd0275a91faf56d2b527b448c3caf4 (patch) | |
| tree | a0a812a082e9cfcabcd797ce707fe49e23fab919 /net/lapb/lapb_out.c | |
| parent | c39378fc65cc83a65e8aed958bcbd18c113c6a74 (diff) | |
| parent | a0118c8b2be9297aed8e915c60b4013326b256d4 (diff) | |
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:
- Missing ULL suffixes for 64-bit constants in sha3.
- Two caam AEAD regressions.
- Bogus setkey hooks in non-hmac caam hashes.
- Missing kbuild dependency for powerpc crc32c"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: caam - fix non-hmac hashes
crypto: powerpc - CRYPT_CRC32C_VPMSUM should depend on ALTIVEC
crypto: caam - defer aead_set_sh_desc in case of zero authsize
crypto: caam - fix echainiv(authenc) encrypt shared descriptor
crypto: sha3 - Add missing ULL suffixes for 64-bit constants
Diffstat (limited to 'net/lapb/lapb_out.c')
0 files changed, 0 insertions, 0 deletions