diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-04 08:53:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-04 08:53:09 -0800 |
| commit | d644c026e6b21959af1f86b15206ae26c64c2e51 (patch) | |
| tree | eadcb52fcdc2bdbf4b7cfe3dd69053f5727c3bc0 /lib/locking-selftest-wlock-hardirq.h | |
| parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | crypto: testmgr - fix sglen in test_aead for case 'dst != src' (diff) | |
| download | linux-dev-d644c026e6b21959af1f86b15206ae26c64c2e51.tar.xz linux-dev-d644c026e6b21959af1f86b15206ae26c64c2e51.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes a number of crashes triggered by a previous crypto
self-test update. It also fixes a build problem in the caam driver,
as well as a concurrency issue in s390.
Finally there is a pair of fixes to bugs in the crypto scatterwalk
code and authenc that may lead to crashes"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: testmgr - fix sglen in test_aead for case 'dst != src'
crypto: talitos - fix aead sglen for case 'dst != src'
crypto: caam - fix aead sglen for case 'dst != src'
crypto: ccm - Fix handling of zero plaintext when computing mac
crypto: s390 - Fix aes-xts parameter corruption
crypto: talitos - corrrectly handle zero-length assoc data
crypto: scatterwalk - Set the chain pointer indication bit
crypto: authenc - Find proper IV address in ablkcipher callback
crypto: caam - Add missing Job Ring include
Diffstat (limited to 'lib/locking-selftest-wlock-hardirq.h')
0 files changed, 0 insertions, 0 deletions