diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-02 21:44:46 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-02 21:44:46 +0300 |
commit | bb329859effa06736c39adf6ce622e86e38fc274 (patch) | |
tree | bdac02a67489ac72de09916cfede54c8f85f1bbc /drivers/vme/vme_bridge.h | |
parent | 46356945fc2bc932dd224af60c12ece2672479be (diff) | |
parent | b425e50492583b10cceb388af36ef0bd3bdf842a (diff) | |
download | linux-bb329859effa06736c39adf6ce622e86e38fc274.tar.xz |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A set of fixes that should go into the next -rc. This contains:
- A use-after-free in the request_list exit for the legacy IO path,
from Bart.
- A fix for CFQ, fixing a recent regression with the conversion to
higher resolution timing for iops mode. From Hou Tao.
- A single fix for nbd, split in two patches, fixing a leak of a data
structure.
- A regression fix from Keith, ensuring that callers of
blk_mq_update_nr_hw_queues() hold the right lock"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: Avoid that blk_exit_rl() triggers a use-after-free
cfq-iosched: fix the delay of cfq_group's vdisktime under iops mode
blk-mq: Take tagset lock when updating hw queues
nbd: don't leak nbd_config
nbd: nbd_reset() call in nbd_dev_add() is redundant
Diffstat (limited to 'drivers/vme/vme_bridge.h')
0 files changed, 0 insertions, 0 deletions