diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-01 14:28:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-01 14:28:42 -0400 |
| commit | f38d2e5313f0af9d9b66c02a5d49c71deb994b85 (patch) | |
| tree | eb4749c402e929b74572ded777fbe5bede3b59e1 /fs | |
| parent | aeb35d6b74174ed08daab84e232b456bbd89d1d9 (diff) | |
| parent | 8cf740ae85df69fb6376f31b42eb2ac7a138721f (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 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 'fs')
0 files changed, 0 insertions, 0 deletions