Messages in this thread Patch in this message | | | From | "R, Monish Kumar" <> | Subject | RE: IGNORE THIS EMAIL [PATCH] Revert "Adding quirk changes for Samsung X5 device" | Date | Wed, 16 Mar 2022 07:55:04 +0000 |
| |
Hi All,
Please ignore this email. I will send another email with patch having subject nvme-pci: Add quirk changes for Samsung X5 device.
Regards, Monish Kumar R
-----Original Message----- From: R, Monish Kumar <monish.kumar.r@intel.com> Sent: 16 March 2022 13:23 To: kbusch@kernel.org; axboe@fb.com; hch@lst.de; sagi@grimberg.me; linux-nvme@lists.infradead.org; linux-kernel@vger.kernel.org Cc: Rao, Abhijeet <abhijeet.rao@intel.com>; R, Monish Kumar <monish.kumar.r@intel.com> Subject: [PATCH] Revert "Adding quirk changes for Samsung X5 device"
From: Monish Kumar R <monish.kumar.r@intel.com>
This reverts commit 1c1b18c97b441cb1a4eb9c6e95d9c357b687cdd0. --- drivers/nvme/host/pci.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index c01cb381c3ff..8bb184a7479c 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3463,10 +3463,14 @@ static const struct pci_device_id nvme_id_table[] = { NVME_QUIRK_128_BYTES_SQES | NVME_QUIRK_SHARED_TAGS | NVME_QUIRK_SKIP_CID_GEN }, +<<<<<<< HEAD { PCI_DEVICE(0x144d, 0xa808), /* Samsung X5 */ .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY| NVME_QUIRK_NO_DEEPEST_PS | NVME_QUIRK_IGNORE_DEV_SUBNQN, }, +======= + +>>>>>>> parent of 1c1b18c97b44... Adding quirk changes for Samsung X5 +>>>>>>> device { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, { 0, } }; -- 2.17.1
| |