From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 3 Jun 2021 13:42:27 +0000 (-0600)
Subject: Merge tag 'nvme-5.13-2021-06-03' of git://git.infradead.org/nvme into block-5.13
X-Git-Tag: v5.15~981^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e369edbb0d8cee50efa6375d5c598a04b7cb3032;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'nvme-5.13-2021-06-03' of git://git.infradead.org/nvme into block-5.13

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.13:

 - fix corruption in RDMA in-capsule SGLs (Sagi Grimberg)
 - nvme-loop reset fixes (Hannes Reinecke)
 - nvmet fix for freeing unallocated p2pmem (Max Gurtovoy)"

* tag 'nvme-5.13-2021-06-03' of git://git.infradead.org/nvme:
  nvmet: fix freeing unallocated p2pmem
  nvme-loop: do not warn for deleted controllers during reset
  nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue()
  nvme-loop: clear NVME_LOOP_Q_LIVE when nvme_loop_configure_admin_queue() fails
  nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues()
  nvme-rdma: fix in-casule data send for chained sgls
---

e369edbb0d8cee50efa6375d5c598a04b7cb3032