diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-14 14:03:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-14 14:03:23 -0800 |
| commit | 6f0d7a9eb60d70f22d71f00b2c762e255881ab31 (patch) | |
| tree | 433b43268507505d3fa1c0dea3f929031ae52661 /net/lapb/lapb_timer.c | |
| parent | 78646f62dbaba99ab0ae50afbe8c2d1876cb4d33 (diff) | |
| parent | 7f60dcaaf91e911002007c7ae885ff6ef0f36c0d (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe:
"Four small fixes that should be merged for the current 3.18-rc series.
This pull request contains:
- a minor bugfix for computation of best IO priority given two
merging requests. From Jan Kara.
- the final (final) merge count issue that has been plaguing
virtio-blk. From Ming Lei.
- enable parallel reinit notify for blk-mq queues, to combine the
cost of an RCU grace period across lots of devices. From Tejun
Heo.
- an error handling fix for the SCSI_IOCTL_SEND_COMMAND ioctl. From
Tony Battersby"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: blk-merge: fix blk_recount_segments()
scsi: Fix more error handling in SCSI_IOCTL_SEND_COMMAND
blk-mq: make mq_queue_reinit_notify() freeze queues in parallel
block: Fix computation of merged request priority
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions