diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-01 20:28:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-01 20:28:42 +0200 |
| commit | f38d2e5313f0af9d9b66c02a5d49c71deb994b85 (patch) | |
| tree | eb4749c402e929b74572ded777fbe5bede3b59e1 /fs/pstore/ram.c | |
| parent | Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | crypto: marvell - Don't copy IV vectors from the _process op for ciphers (diff) | |
| download | linux-f38d2e5313f0af9d9b66c02a5d49c71deb994b85.tar.xz linux-f38d2e5313f0af9d9b66c02a5d49c71deb994b85.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 a number of regressions in the marvell cesa driver caused
by the chaining work, and a regression in lib/mpi that leads to a
GFP_KERNEL allocation with preemption disabled"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: marvell - Don't copy IV vectors from the _process op for ciphers
lib/mpi: Fix SG miter leak
crypto: marvell - Update cache with input sg only when it is unmapped
crypto: marvell - Don't chain at DMA level when backlog is disabled
crypto: marvell - Fix memory leaks in TDMA chain for cipher requests
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions