From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 27 Oct 2022 13:49:21 +0000 (-0600)
Subject: Merge tag 'nvme-6.1-2022-10-27' of git://git.infradead.org/nvme into block-6.1
X-Git-Tag: block-6.1-2022-10-28~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=dea31328d424b5c11c65a3cf9936656abafe94ba;p=linux-2.6-block.git

Merge tag 'nvme-6.1-2022-10-27' of git://git.infradead.org/nvme into block-6.1

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 6.1

 - make the multipath dma alignment to match the non-multipath one
   (Keith Busch)
 - fix a bogus use of sg_init_marker() (Nam Cao)
 - fix circulr locking in nvme-tcp (Sagi Grimberg)"

* tag 'nvme-6.1-2022-10-27' of git://git.infradead.org/nvme:
  nvme-multipath: set queue dma alignment to 3
  nvme-tcp: fix possible circular locking when deleting a controller under memory pressure
  nvme-tcp: replace sg_init_marker() with sg_init_table()
---

dea31328d424b5c11c65a3cf9936656abafe94ba