[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20140828202350.GA26869@kernel.dk>
Date: Thu, 28 Aug 2014 14:23:50 -0600
From: Jens Axboe <axboe@...com>
To: <torvalds@...ux-foundation.org>
CC: <linux-kernel@...r.kernel.org>
Subject: [GIT PULL] Block fixes for 3.17
Hi Linus,
Smaller collection of fixes that have come up since the initial merge
window pull request. It contains:
- Error handling cleanup and support for larger than 16 byte cdbs in
sg_io() from Christoph. The latter just matches what bsg and friends
support, sg_io() got left out in the merge.
- An option for brd to expose partitions in /proc/partitions. They are
hidden by default for compat reasons. From Dmitry Monakhov.
- A few blk-mq fixes from me - killing a dead/unused flag, fix for
merging happening even if turned off, and correction of a few
comments.
- Removal of unnecessary ->owner setting in systemace. From Michal
Simek.
- Two related fixes for a problem with nesting freezing of queues in
blk-mq. One from Ming Lei removing an unecessary freeze operation, and
another from Tejun fixing the nesting regression introduced in the
merge window.
- Fix for a BUG_ON() at bio_endio time when protection info is attached
and the IO has an error. From Sagi Grimberg.
- Two scsi_ioctl bug fixes for regressions with scsi-mq from Tony
Battersby.
- A cfq weight update fix and subsequent comment update from Toshiaki
Makita.
Please pull!
git://git.kernel.dk/linux-block.git for-linus
----------------------------------------------------------------
Christoph Hellwig (2):
block: cleanup error handling in sg_io
block: support > 16 byte CDBs for SG_IO
Dmitry Monakhov (1):
brd: add ram disk visibility option
Jens Axboe (3):
blk-mq: get rid of unused BLK_MQ_F_SHOULD_SORT flag
blk-mq: don't allow merges if turned off for the queue
blk-mq: correct a few wrong/bad comments
Michal Simek (1):
block: systemace: Remove .owner field for driver
Ming Lei (1):
blk-mq: fix WARNING "percpu_ref_kill() called more than once!"
Sabrina Dubroca (1):
block: fix error handling in sg_io
Sagi Grimberg (1):
block: Fix BUG_ON when pi errors occur
Tejun Heo (1):
blk-mq: blk_mq_freeze_queue() should allow nesting
Tony Battersby (2):
scsi-mq: fix requests that use a separate CDB buffer
fix regression in SCSI_IOCTL_SEND_COMMAND
Toshiaki Makita (2):
cfq-iosched: Fix wrong children_weight calculation
cfq-iosched: Add comments on update timing of weight
block/bio-integrity.c | 2 +-
block/blk-core.c | 1 -
block/blk-mq.c | 36 ++++++++++++++++++++++--------------
block/cfq-iosched.c | 19 ++++++++++++++++---
block/scsi_ioctl.c | 40 +++++++++++++++++++++++++++-------------
drivers/block/brd.c | 6 +++++-
drivers/block/xsysace.c | 1 -
drivers/scsi/scsi_lib.c | 1 -
include/linux/blk-mq.h | 7 +++----
9 files changed, 74 insertions(+), 39 deletions(-)
--
Jens Axboe
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists