diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-12-19 08:08:41 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-12-19 08:08:41 -0700 |
| commit | 499aeb45b2e225e423ef333ec68bd9b33a42c8be (patch) | |
| tree | 896081abe12f6fd5b12c79515dbc2b08457dc6f3 /kernel | |
| parent | cd19181bf9ad4b7f40f2a4e0355d052109c76529 (diff) | |
| parent | 604c01d567cb9ee7d19dc598272cb90ab6229a8a (diff) | |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions