]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 667811e 418b1ad)
Merge branch 'nvme-4.14' of git://git.infradead.org/nvme into for-linus
authorJens Axboe <axboe@kernel.dk>
Thu, 5 Oct 2017 16:44:04 +0000 (10:44 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 5 Oct 2017 16:44:04 +0000 (10:44 -0600)
commit12327ee90c1b91fee1da918dad62974913d5be4b
tree69c40643ec8db4e878326dfdda66e6023f667b21tree | snapshot
parent667811ecc11c6785a0342b6178f58b13e7fec8c6commit | diff
parent418b1ad0e9c2e143a3664da425b796d4ad609368commit | diff
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."
Linux Kernel Source Tree.