diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-29 14:30:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-29 14:30:19 -0700 |
| commit | 806276b7f07a39a1cc3f38bb1ef5c573d4594a38 (patch) | |
| tree | 27cba483a484d6f61de77a810a053ea7748eddc8 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'apw' (xfrm_user fixes) (diff) | |
| parent | nbd: replace kill_bdev() with __invalidate_device() (diff) | |
| download | wireguard-linux-806276b7f07a39a1cc3f38bb1ef5c573d4594a38.tar.xz wireguard-linux-806276b7f07a39a1cc3f38bb1ef5c573d4594a38.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Five fixes for this series:
- a fix from me to ensure that blk-mq drivers that terminate IO in
their ->queue_rq() handler by returning QUEUE_ERROR don't stall
with a scheduler enabled.
- four nbd fixes from Josef and Ratna, fixing various problems that
are critical enough to go in for this cycle. They have been well
tested"
* 'for-linus' of git://git.kernel.dk/linux-block:
nbd: replace kill_bdev() with __invalidate_device()
nbd: set queue timeout properly
nbd: set rq->errors to actual error code
nbd: handle ERESTARTSYS properly
blk-mq: include errors in did_work calculation
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions