Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-4.12/block
authorJens Axboe <axboe@fb.com>
Fri, 21 Apr 2017 17:14:22 +0000 (11:14 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 21 Apr 2017 17:14:22 +0000 (11:14 -0600)
Christoph writes:

This is the current NVMe pile: virtualization extensions, lots of FC
updates and various misc bits.  There are a few more FC bits that didn't
make the cut, but we'd like to get this request out before the merge
window for sure.


Trivial merge