Skip to contentSkip to conversation

Block fixes for 4.6-rc1

GIT PULL Jens Axboe 1 participant 1 message Mar 24, 2016

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

Final round of fixes for this merge window - some of this has come up after the initial pull request, and some of it was put in a post-merge branch before the merge window. This pull request contains:

- Fix for a bad check for an error on dma mapping in the mtip32xx driver, from Alexey Khoroshilov.

- A set of fixes for lightnvm, from Javier, Matias, and Wenwei.

- An NVMe completion record corruption fix from Marta, ensuring that we read things in the right order.

- Two writeback fixes from Tejun, marked for stable@ as well.

- A blk-mq sw queue iterator fix from Thomas, fixing an oops for sparse CPU maps. They hit this in the hot plug/unplug rework.

Please pull!

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

----------------------------------------------------------------
Alexey Khoroshilov (1):
mtip32xx: fix checks for dma mapping errors

Javier González (2):
lightnvm: do not reserve lun on l2p loading
lightnvm: do not load L2P table if not supported

Marta Rybczynska (1):
nvme: avoid cqe corruption when update at the same time as read

Matias Bjorling (1):
nvme: lightnvm: return ppa completion status

Tejun Heo (2):
writeback, cgroup: fix premature wb_put() in locked_inode_to_wb_and_lock_list() writeback, cgroup: fix use of the wrong bdi_writeback which mismatches the inode

Thomas Gleixner (1):
blk-mq: Use proper cpumask iterator

Wenwei Tao (3):
null_blk: add lightnvm null_blk device to the nullb_list
lightnvm: specify target's logical address area
lightnvm: add a bitmap of luns

 block/blk-mq-sysfs.c              |   6 ++-
 block/blk-mq.c                    |   3 +-
 drivers/block/mtip32xx/mtip32xx.c |   4 +-
 drivers/block/null_blk.c          |   3 +-
 drivers/lightnvm/core.c           |   7 +++
 drivers/lightnvm/gennvm.c         |  84 ++++++++++++++++++++++++++++-
 drivers/lightnvm/gennvm.h         |   6 +++
 drivers/lightnvm/rrpc.c           | 109 +++++++++++++++++++++++++++-----------
 drivers/lightnvm/rrpc.h           |   1 +
 drivers/nvme/host/lightnvm.c      |  17 +++++-
 drivers/nvme/host/pci.c           |  24 +++++----
 fs/fs-writeback.c                 |  37 ++++++++-----
 include/linux/blk-mq.h            |  14 -----
 include/linux/lightnvm.h          |  14 +++++
 14 files changed, 251 insertions(+), 78 deletions(-)
Signature · 1 line
Jens Axboe