diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-22 15:00:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-22 15:00:11 -0700 |
| commit | 68cf8d0c720cdb76dc912c983d8dae9de6d6e5cf (patch) | |
| tree | 41779dfce5cae3dc495f27f76ed8e66dd046ac4c /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs (diff) | |
| parent | cfq: explicitly use 64bit divide operation for 64bit arguments (diff) | |
| download | wireguard-linux-68cf8d0c720cdb76dc912c983d8dae9de6d6e5cf.tar.xz wireguard-linux-68cf8d0c720cdb76dc912c983d8dae9de6d6e5cf.zip | |
Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block
Pull block IO fixes from Jens Axboe:
"After merge window, no new stuff this time only a collection of neatly
confined and simple fixes"
* 'for-3.12/core' of git://git.kernel.dk/linux-block:
cfq: explicitly use 64bit divide operation for 64bit arguments
block: Add nr_bios to block_rq_remap tracepoint
If the queue is dying then we only call the rq->end_io callout. This leaves bios setup on the request, because the caller assumes when the blk_execute_rq_nowait/blk_execute_rq call has completed that the rq->bios have been cleaned up.
bio-integrity: Fix use of bs->bio_integrity_pool after free
blkcg: relocate root_blkg setting and clearing
block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)
block: trace all devices plug operation
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions