Merge tag 'block-6.3-2023-04-14' of git://git.kernel.dk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Apr 2023 17:39:18 +0000 (10:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Apr 2023 17:39:18 +0000 (10:39 -0700)
Pull block fix from Jens Axboe:
 "A single NVMe quirk entry addition"

* tag 'block-6.3-2023-04-14' of git://git.kernel.dk/linux:
  nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD

drivers/nvme/host/pci.c

index 282d808400c5bee4dc599468148e5c86c79ee950..cd7873de312154696079e390e83439983bc0762e 100644 (file)
@@ -3443,6 +3443,8 @@ static const struct pci_device_id nvme_id_table[] = {
        { PCI_DEVICE(0x1d97, 0x2269), /* Lexar NM760 */
                .driver_data = NVME_QUIRK_BOGUS_NID |
                                NVME_QUIRK_IGNORE_DEV_SUBNQN, },
+       { PCI_DEVICE(0x10ec, 0x5763), /* TEAMGROUP T-FORCE CARDEA ZERO Z330 SSD */
+               .driver_data = NVME_QUIRK_BOGUS_NID, },
        { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061),
                .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, },
        { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),