From: Jens Axboe <axboe@fb.com>
To: <torvalds@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>
Subject: [GIT PULL] Block changes for 3.16-rc
Date: Thu, 26 Jun 2014 11:17:12 -0600 [thread overview]
Message-ID: <20140626171712.GA20475@kernel.dk> (raw)
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
reply other threads:[~2014-06-26 17:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140626171712.GA20475@kernel.dk \
--to=axboe@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox