linux-kernel - RE: IGNORE THIS EMAIL [PATCH] Revert "Adding quirk changes for Samsung X5 device"

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <SA2PR11MB5115A5586E4D0538D8EC2394C3119@SA2PR11MB5115.namprd11.prod.outlook.com>
Date:   Wed, 16 Mar 2022 07:55:04 +0000
From:   "R, Monish Kumar" <monish.kumar.r@...el.com>
To:     "kbusch@...nel.org" <kbusch@...nel.org>,
        "axboe@...com" <axboe@...com>, "hch@....de" <hch@....de>,
        "sagi@...mberg.me" <sagi@...mberg.me>,
        "linux-nvme@...ts.infradead.org" <linux-nvme@...ts.infradead.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: IGNORE  THIS EMAIL [PATCH] Revert "Adding quirk changes for
 Samsung X5 device"

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@...el.com> 
Sent: 16 March 2022 13:23
To: kbusch@...nel.org; axboe@...com; hch@....de; sagi@...mberg.me; linux-nvme@...ts.infradead.org; linux-kernel@...r.kernel.org
Cc: Rao, Abhijeet <abhijeet.rao@...el.com>; R, Monish Kumar <monish.kumar.r@...el.com>
Subject: [PATCH] Revert "Adding quirk changes for Samsung X5 device"

From: Monish Kumar R <monish.kumar.r@...el.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