diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-01 09:24:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-01 09:24:00 -0800 |
| commit | e387dc122fc7c70c2a5df2567f4e2d1114f5a5da (patch) | |
| tree | de85b3994f8b987e23caa2c9b256aeccb065bb17 /net/mac80211/wme.h | |
| parent | 35609502ac5dea2b149ec0368791d9c0e246bd65 (diff) | |
| parent | 11e3b725cfc282efe9d4a354153e99d86a16af08 (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 a bug in CBC/CTR on ARM64 that breaks chaining as well as a
bug in the core API that causes registration failures when a driver
unloads and then reloads an algorithm"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes
crypto: api - Clear CRYPTO_ALG_DEAD bit before registering an alg
Diffstat (limited to 'net/mac80211/wme.h')
0 files changed, 0 insertions, 0 deletions