From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 19 Dec 2018 15:08:41 +0000 (-0700)
Subject: Merge branch 'nvme-4.21' of git://git.infradead.org/nvme into for-4.21/block
X-Git-Tag: v5.15~7255^2~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=499aeb45b2e225e423ef333ec68bd9b33a42c8be;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'nvme-4.21' of git://git.infradead.org/nvme into for-4.21/block

Pull last batch of NVMe updates for 4.21 from Christoph:

"This contains a series from Sagi to restore poll support for nvme-rdma,
 a new tracepoint from yupeng and various fixes."

* 'nvme-4.21' of git://git.infradead.org/nvme:
  nvme-pci: trace SQ status on completions
  nvme-rdma: implement polling queue map
  nvme-fabrics: allow user to pass in nr_poll_queues
  nvme-fabrics: allow nvmf_connect_io_queue to poll
  nvme-core: optionally poll sync commands
  block: make request_to_qc_t public
  nvme-tcp: fix spelling mistake "attepmpt" -> "attempt"
  nvme-tcp: fix endianess annotations
  nvmet-tcp: fix endianess annotations
  nvme-pci: refactor nvme_poll_irqdisable to make sparse happy
  nvme-pci: only set nr_maps to 2 if poll queues are supported
  nvmet: use a macro for default error location
  nvmet: fix comparison of a u16 with -1
---

499aeb45b2e225e423ef333ec68bd9b33a42c8be