projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eab40cf 8969f1f)
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)
commitd7b544def408ab5dc724e8887ca696db59cd9216
tree69c40643ec8db4e878326dfdda66e6023f667b21tree | snapshot
parenteab40cf336065e8d765e006b81ff48c5c114b365commit | diff
parent8969f1f8291762c13147c1ba89d46238af01675bcommit | 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."
John Crispins staging tree