From: Linus Torvalds Date: Thu, 16 Feb 2023 20:05:33 +0000 (-0800) Subject: Merge tag 'block-6.2-2023-02-16' of git://git.kernel.dk/linux X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d3d6f0eb086d3d68960ded479e846e7dcfcec2bb;p=linux.git Merge tag 'block-6.2-2023-02-16' of git://git.kernel.dk/linux Pull block fixes from Jens Axboe: "Just a few NVMe fixes that should go into the 6.2 release, adding a quirk and fixing two issues introduced in this release: - NVMe fixes via Christoph: - Always return an ERR_PTR from nvme_pci_alloc_dev (Irvin Cote) - Add bogus ID quirk for ADATA SX6000PNP (Daniel Wagner) - Set the DMA mask earlier (Christoph Hellwig)" * tag 'block-6.2-2023-02-16' of git://git.kernel.dk/linux: nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev nvme-pci: set the DMA mask earlier nvme-pci: add bogus ID quirk for ADATA SX6000PNP --- d3d6f0eb086d3d68960ded479e846e7dcfcec2bb