Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-linus
authorJens Axboe <axboe@kernel.dk>
Fri, 12 Jan 2018 17:42:36 +0000 (10:42 -0700)
committerJens Axboe <axboe@kernel.dk>
Fri, 12 Jan 2018 17:42:36 +0000 (10:42 -0700)
commit32835a074171e7b83c1cefbbf9d681bb9518bbd5
tree8a577c43f42bbb55b7fcfca8a8616ab6e5d943e5
parentae6650163c66a7eff1acd6eb8b0f752dcfa8eba5
parent6b018235b4daabae96d855219fae59c3fb8be417
Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-linus

Pull a single NVMe fix from Christoph for 4.15.