diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-25 09:15:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-25 09:15:03 -0700 |
| commit | f6f3e747454fc539bbd7904cf70672368289d820 (patch) | |
| tree | 3eaf09808e449c370cf7c3e81d9aa6ea2f414099 /fs | |
| parent | cd8dead0c39457e58ec1d36db93aedca811d48f1 (diff) | |
| parent | b257b48cd5830c5b1d0c347eb281f9c28056f881 (diff) | |
| download | linux-f6f3e747454fc539bbd7904cf70672368289d820.tar.bz2 | |
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 xts and lrw where they may sleep in an atomic
context"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: lrw - Fix atomic sleep when walking skcipher
crypto: xts - Fix atomic sleep when walking skcipher
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions