diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-01-26 11:13:01 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-01-26 11:13:01 -0700 |
| commit | b16791de6daf641703c85db32415e7fde2202f54 (patch) | |
| tree | 4e838cbfa69d0a9bf6fbfe0c994a6cf555351d25 /block/blk-map.c | |
| parent | 3124b65dad946c20feaaf08959ee38ec27361da9 (diff) | |
| parent | ca5554a696dce37852f6d6721520b4f13fc295c3 (diff) | |
Merge branch 'nvme-4.16' of git://git.infradead.org/nvme into for-4.16/block
Pull NVMe fixes from Christoph:
"The additional week before the 4.15 release gave us time for a few more
nvme fixes, as well as the nifty trace points from Johannes"
* 'nvme-4.16' of git://git.infradead.org/nvme:
nvme: add tracepoint for nvme_complete_rq
nvme: add tracepoint for nvme_setup_cmd
nvme-pci: introduce RECONNECTING state to mark initializing procedure
nvme-rdma: remove redundant boolean for inline_data
nvme: don't free uuid pointer before printing it
nvme-pci: Suspend queues after deleting them
nvme-pci: Fix queue double allocations
Diffstat (limited to 'block/blk-map.c')
0 files changed, 0 insertions, 0 deletions