Skip to contentSkip to conversation

Few simple fixups for 4.1 final

GIT PULL Jens Axboe 1 participant 1 message Jun 12, 2015

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

Remember about a week ago when I sent the last pull request for 4.1? Well, I lied. Now, I don't want to shift the blame, but Dan, Ming, and Richard made a liar out of me.

Here are three small patches that should go into 4.1. More specifically, this pull request contains:

- A Kconfig dependency for the pmem block driver, so it can't be selected if HAS_IOMEM isn't availble. From Richard Weinberger.

- A fix for genhd, making the ext_devt_lock softirq safe. This makes lockdep happier, since we also end up grabbing this lock on release off the softirq path. From Dan Williams.

- A blk-mq software queue release fix from Ming Lei.

Last two are headed to stable, first fixes an issue introduced in this cycle.

Please pull!

git://git.kernel.dk/linux-block.git for-linus

----------------------------------------------------------------
Dan Williams (1):
block: fix ext_dev_lock lockdep report

Ming Lei (1):

      blk-mq: free hctx->ctxs in queue's release handler

Richard Weinberger (1):
block: pmem: Add dependency on HAS_IOMEM

 block/blk-mq.c        |  8 ++++++--
 block/genhd.c         | 12 ++++++------
 drivers/block/Kconfig |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)
Signature · 1 line
Jens Axboe