Hi Linus,
A small collection of fixes/changes for the current series. The pull
request contains:
- Removal of dead code from Gu Zheng.
- Revert of two bad fixes that went in earlier in this round, marking
things as __init that were not purely used from init.
- A fix for blk_mq_start_hw_queue() using the __blk_mq_run_hw_queue(),
which could place us wrongly. Make it use the non __ variant, which
handles cases where we are called from the wrong CPU set. From me.
- A fix for drbd, which allocates discard requests without room for the
SCSI payload. From Lars Ellenberg.
- A fix for user-after-free in the blkcg code from Tejun.
- Addition of limiting gaps in SG lists, if the hardware needs it. This
is the last pre-req patch for blk-mq to enable the full NVMe
conversion. Could wait until 3.17, but it's simple enough so would be
nice to have everything we need for the NVMe port in the 3.17 release.
From me.
Please pull!
git://git.kernel.dk/linux-block.git for-linus
----------------------------------------------------------------
Gu Zheng (1):
bio: remove unused macro bip_vec_idx()
Jens Axboe (5):
Merge branch 'for-jens' of git://git.kernel.org/.../jikos/linux-block
into for-linus
Revert "block: add __init to blkcg_policy_register"
Revert "block: add __init to elv_register"
block: add support for limiting gaps in SG lists
blk-mq: blk_mq_start_hw_queue() should use blk_mq_run_hw_queue()
Jiri Kosina (1):
floppy: format block0 read error message properly
Lars Ellenberg (1):
drbd: fix NULL pointer deref in blk_add_request_payload
Tejun Heo (1):
blkcg: fix use-after-free in __blkg_release_rcu() by making blkcg_gq
refcnt an atomic_t
block/bio.c | 8 ++++++++
block/blk-cgroup.c | 9 +++------
block/blk-cgroup.h | 21 +++++++++------------
block/blk-merge.c | 10 ++++++++++
block/blk-mq.c | 2 +-
block/elevator.c | 2 +-
drivers/block/drbd/drbd_receiver.c | 5 ++++-
drivers/block/floppy.c | 2 +-
include/linux/bio.h | 13 +++++++++----
include/linux/blkdev.h | 1 +
include/linux/elevator.h | 2 +-
11 files changed, 48 insertions(+), 27 deletions(-)
--
Jens Axboe
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
