Merge branch 'nvme-4.16' of git://git.infradead.org/nvme into for-4.16/block
authorJens Axboe <axboe@kernel.dk>
Fri, 26 Jan 2018 18:13:01 +0000 (11:13 -0700)
committerJens Axboe <axboe@kernel.dk>
Fri, 26 Jan 2018 18:13:01 +0000 (11:13 -0700)
commitb16791de6daf641703c85db32415e7fde2202f54
tree4e838cbfa69d0a9bf6fbfe0c994a6cf555351d25
parent3124b65dad946c20feaaf08959ee38ec27361da9
parentca5554a696dce37852f6d6721520b4f13fc295c3
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