Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   "R, Monish Kumar" <monish.kumar.r@intel.com>
To:     "kbusch@kernel.org" <kbusch@kernel.org>,
        "axboe@fb.com" <axboe@fb.com>, "hch@lst.de" <hch@lst.de>,
        "sagi@grimberg.me" <sagi@grimberg.me>,
        "linux-nvme@lists.infradead.org" <linux-nvme@lists.infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: IGNORE  THIS EMAIL [PATCH] Revert "Adding quirk changes for
 Samsung X5 device"
Thread-Topic: IGNORE  THIS EMAIL [PATCH] Revert "Adding quirk changes for
 Samsung X5 device"
Thread-Index: Adg5Cu+7hRd2iR8qQ3a2VcYKdofwQg==
Date:   Wed, 16 Mar 2022 07:55:04 +0000
Message-ID: <SA2PR11MB5115A5586E4D0538D8EC2394C3119@SA2PR11MB5115.namprd11.prod.outlook.com>
Accept-Language: en-US
Content-Language: en-US
dlp-product: dlpe-windows
dlp-version: 11.6.401.20
dlp-reaction: no-action
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?oipCWAxoIuXGDwzQyDovMUqnditPBojE3ygGNlyx4e+OKK0dlLu1+z0Jcj+h?=
 =?us-ascii?Q?ATtsiPGwnXKOxSJDQTwZcehyMWSuM4bwQisMkuIiVh+BIQPU4Z6o2duI+Vb/?=
 =?us-ascii?Q?WAQ501BkRYKPc/+OxakoX5jj0f4RDJlHcmELkda+9k8oROzN3G8z+UME03gU?=
 =?us-ascii?Q?8ErEGMkFn3QGBJStWztg8g5JsbkAQRtDi335FHO4Hu9p4yAhdPRdrGbXV+bg?=
 =?us-ascii?Q?tSKfJ7T4vGStCsGhmv2jIow3UWC3F1weHdW60JWMwD/6Bm9wTwSvf742l8XL?=
 =?us-ascii?Q?JgEvNi3sm4dseItWX+SDeI5vi97qZ3kdq3tFXq/5HxajlelBD6vhflfb+seI?=
 =?us-ascii?Q?d+n7EfuNGhHqZgGSrg9yr3Kehiq9Zv6Vinv5xQVXozsOHPA5EwNunp+zQRDH?=
 =?us-ascii?Q?Z66EVkPowkIJX64sOP3QI1jl3+dIHgXf/jjqmOUk3IznOwPhl5Z/7UpFzm2K?=
 =?us-ascii?Q?ILIWbBe1aB6qnMZZdbHWkOXRjF+LaGGx7eorTeSYDmNw64OOVWUGsH8VHcXl?=
 =?us-ascii?Q?YXxzMjm5bSC+2wD0UIefja5nCmnVKBLTjIc9oA9AkLCe45wRdP2PIzlR/Aix?=
 =?us-ascii?Q?hpIitNR5EV62ows+KSft11Mv1IVskNCYXuZrlGbozRZ3KiSThqUriCMoQEud?=
 =?us-ascii?Q?Zj7khwSAiZsO8e8g+zj8g6cRSkW9Wp+SIQK2HTFAFwk70bLxI8s+hRzOarqc?=
 =?us-ascii?Q?I7ggUYkJ9AcS0oCfgHu4p97EjijCrrnSQ66lSXd5cXm7EZyRLTeu2JGL0KDw?=
 =?us-ascii?Q?gs8lHH/VFlebUZYDwkt+kHLe+w5roy2A8IuT0NndCxIXIgAfcCdv5ojM9HvW?=
 =?us-ascii?Q?XnoFvEjfYFcArUTCg+m7LamDSXrbU8OjDBVulMCPmzM5FDS/41x1cBeTt1Wm?=
 =?us-ascii?Q?LSZ4eXolfi4yUvWXYufW+puV15UMY9Bzx8uYd97aeSehhvaUcaJ9V4bzzRX8?=
 =?us-ascii?Q?8em1r3qoe0C3mH80l8g2/1x5CsSnZ3lye4L+23z91m5nxCBrzFFcJ1Pcq1mi?=
 =?us-ascii?Q?+Y18ZfCc9J9i9OL6w/TTvIUjCQp3QlN2p9wG4DWExTYVLCdPKOyuK0/+pFkj?=
 =?us-ascii?Q?hOFxW1y5foIegSEdP0fBCnvaFSHa2J51kQMaspVOCeQsQszTb7ISCePDZ7WW?=
 =?us-ascii?Q?riswRV+f6oV7tzgf8gT3co2/W1WtaDFpeZuDW/fnsn+RUzU4dmbm6YYa9Ufx?=
 =?us-ascii?Q?t5w3Frk4Mgnlobmx/DI81+4dpYGDDrlmLsxS9JpqR6/+KaktVmUhRig47WkW?=
 =?us-ascii?Q?MPeZBfdcbeMPRUgdu5d1t6kA6SML16NMIL4Ni3+DnF5b/Qj/3S6v+/ij6eV0?=
 =?us-ascii?Q?/OeqnRMIXYs4CvMNzEzpoTrtTDo00LpvULqI1ynQ/NUDCqXYVYs1v+LWr+RM?=
 =?us-ascii?Q?FrGO/iy3LSNCm7DKrD8fjV32jbA6D9zPRwk3S4Cio/cZr90IGcFOSfpf8s0G?=
 =?us-ascii?Q?qKhKslzl6ltFUHWpMpAD4TU9AkttHQe+wRqBd5J8Ifk3sOFzlyJcMA=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SA2PR11MB5115.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 506be9f6-3921-4976-58fb-08da07224842
X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Mar 2022 07:55:04.7999
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: SdRGWlel46W3wfeCq1/1DjX4VKfUIyUlJwK1Em+dRD8J/SE9qlMe50QVZC9GR2WmSpJYaJ1VOUM5gNzMWzDw3Xzj7l7faYqv5mmUcg8x34c=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1620
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi All,=20

Please ignore this email.
I will send another email with patch having subject nvme-pci: Add quirk cha=
nges for Samsung X5 device.

Regards,
Monish Kumar R


-----Original Message-----
From: R, Monish Kumar <monish.kumar.r@intel.com>=20
Sent: 16 March 2022 13:23
To: kbusch@kernel.org; axboe@fb.com; hch@lst.de; sagi@grimberg.me; linux-nv=
me@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 c01cb3=
81c3ff..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[] =
=3D {
 				NVME_QUIRK_128_BYTES_SQES |
 				NVME_QUIRK_SHARED_TAGS |
 				NVME_QUIRK_SKIP_CID_GEN },
+<<<<<<< HEAD
 	{ PCI_DEVICE(0x144d, 0xa808), /* Samsung X5 */
 		.driver_data =3D  NVME_QUIRK_DELAY_BEFORE_CHK_RDY|
 				NVME_QUIRK_NO_DEEPEST_PS |
 				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
+=3D=3D=3D=3D=3D=3D=3D
+
+>>>>>>> parent of 1c1b18c97b44... Adding quirk changes for Samsung X5=20
+>>>>>>> device
 	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
 	{ 0, }
 };
--
2.17.1