diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-13 19:33:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-13 19:33:22 +0200 |
| commit | 34bef46e786ca6f884b8ed4be89e07b62f28ec3c (patch) | |
| tree | 7b8bcee0b8fb4ec18866e067d0164890f1dbcfac /drivers/net/macvtap.c | |
| parent | Linux 4.2-rc2 (diff) | |
| parent | crypto: nx - Fix reentrancy bugs (diff) | |
| download | linux-34bef46e786ca6f884b8ed4be89e07b62f28ec3c.tar.xz linux-34bef46e786ca6f884b8ed4be89e07b62f28ec3c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a duplicate dma_unmap_sg call in omap-des and reentrancy
bugs in the powerpc nx driver which may cause bogus output or worse
memory corruption"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: nx - Fix reentrancy bugs
crypto: omap-des - Fix unmapping of dma channels
Diffstat (limited to 'drivers/net/macvtap.c')
0 files changed, 0 insertions, 0 deletions