diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-06 00:33:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-06 00:33:27 +0100 |
| commit | 5ee540613db504a10e15fafaf4c08cac96aa1823 (patch) | |
| tree | dc0b348debbb557866285dbee51e29ff3496ffa4 /security/integrity/ima/ima.h | |
| parent | Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | blk-mq: fix use-after-free of request (diff) | |
| download | linux-5ee540613db504a10e15fafaf4c08cac96aa1823.tar.xz linux-5ee540613db504a10e15fafaf4c08cac96aa1823.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe:
"A small collection of fixes for the current series. It contains:
- A fix for a use-after-free of a request in blk-mq. From Ming Lei
- A fix for a blk-mq bug that could attempt to dereference a NULL rq
if allocation failed
- Two xen-blkfront small fixes
- Cleanup of submit_bio_wait() type uses in the kernel, unifying
that. From Kent
- A fix for 32-bit blkg_rwstat reading. I apologize for this one
looking mangled in the shortlog, it's entirely my fault for missing
an empty line between the description and body of the text"
* 'for-linus' of git://git.kernel.dk/linux-block:
blk-mq: fix use-after-free of request
blk-mq: fix dereference of rq->mq_ctx if allocation fails
block: xen-blkfront: Fix possible NULL ptr dereference
xen-blkfront: Silence pfn maybe-uninitialized warning
block: submit_bio_wait() conversions
Update of blkg_stat and blkg_rwstat may happen in bh context
Diffstat (limited to 'security/integrity/ima/ima.h')
0 files changed, 0 insertions, 0 deletions