tree 69c40643ec8db4e878326dfdda66e6023f667b21
parent eab40cf336065e8d765e006b81ff48c5c114b365
parent 8969f1f8291762c13147c1ba89d46238af01675b
author Jens Axboe <axboe@kernel.dk> 1507221844 -0600
committer Jens Axboe <axboe@kernel.dk> 1507221844 -0600

Merge branch 'nvme-4.14' of git://git.infradead.org/nvme into for-linus

Pull NVMe fixes from Christoph:

"A trivial one-liner from Martin to fix the visible of the uuid attr,
and another one (originally from Abhishek Shah, rewritten by me) to fix
the CMB addresses passed back to the controller in case of a system that
remaps BAR addresses between host and device."