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

Browse source

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."

...

This commit is contained in:

Jens Axboe 2017-10-05 10:44:04 -06:00

parent eab40cf336 8969f1f829

commit d7b544def4

2 changed files with 8 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/nvme/host/core.c

View file

14

drivers/nvme/host/pci.c

View file