From: Jens Axboe Date: Thu, 21 Jan 2021 12:40:34 +0000 (-0700) Subject: Merge tag 'nvme-5.11-2020-01-21' of git://git.infradead.org/nvme into block-5.11 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1df35bf0b4e17322ec67e88b86ba21a17f904069;p=linux.git Merge tag 'nvme-5.11-2020-01-21' of git://git.infradead.org/nvme into block-5.11 Pull NVMe fixes from Christoph: "nvme fixes for 5.11: - fix a status code in nvmet (Chaitanya Kulkarni) - avoid double completions in nvme-rdma/nvme-tcp (Chao Leng) - fix the CMB support to cope with NVMe 1.4 controllers (Klaus Jensen) - fix PRINFO handling in the passthrough ioctl (Revanth Rajashekar) - fix a double DMA unmap in nvme-pci" * tag 'nvme-5.11-2020-01-21' of git://git.infradead.org/nvme: nvme-pci: fix error unwind in nvme_map_data nvme-pci: refactor nvme_unmap_data nvmet: set right status on error in id-ns handler nvme-pci: allow use of cmb on v1.4 controllers nvme-tcp: avoid request double completion for concurrent nvme_tcp_timeout nvme-rdma: avoid request double completion for concurrent nvme_rdma_timeout nvme: check the PRINFO bit before deciding the host buffer length --- 1df35bf0b4e17322ec67e88b86ba21a17f904069