diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 06:00:44 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 06:00:44 +0300 |
commit | 1d02369dba2cd9db110f0f35d9a777ee691e498b (patch) | |
tree | c8af3d14a5a37e73e0289ab8305e6cca695fbd39 /block/blk.h | |
parent | 8f40842e4260f73792c156aded004197a19135ee (diff) | |
parent | d783e0bd02e700e7a893ef4fa71c69438ac1c276 (diff) | |
download | linux-1d02369dba2cd9db110f0f35d9a777ee691e498b.tar.xz |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"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 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"
* 'for-linus' of git://git.kernel.dk/linux-block:
nvme: avoid cqe corruption when update at the same time as read
writeback, cgroup: fix use of the wrong bdi_writeback which mismatches the inode
writeback, cgroup: fix premature wb_put() in locked_inode_to_wb_and_lock_list()
blk-mq: Use proper cpumask iterator
mtip32xx: fix checks for dma mapping errors
lightnvm: do not load L2P table if not supported
lightnvm: do not reserve lun on l2p loading
nvme: lightnvm: return ppa completion status
lightnvm: add a bitmap of luns
lightnvm: specify target's logical address area
null_blk: add lightnvm null_blk device to the nullb_list
Diffstat (limited to 'block/blk.h')
0 files changed, 0 insertions, 0 deletions