From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09293C77B76 for ; Mon, 17 Apr 2023 08:02:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229822AbjDQICY (ORCPT ); Mon, 17 Apr 2023 04:02:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229929AbjDQICU (ORCPT ); Mon, 17 Apr 2023 04:02:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D94273AA8 for ; Mon, 17 Apr 2023 01:02:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7519861FBC for ; Mon, 17 Apr 2023 08:02:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67901C4339B; Mon, 17 Apr 2023 08:02:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681718536; bh=k3JkSVI1ZjZi/daoo7Ma4aJS2YdtkzfwoA5winCs8MA=; h=Subject:To:Cc:From:Date:From; b=i6VphN7D28gcmim2DXYE8RIAyFMn+2FrXDRoigm6cQmeIVfOt0kxVg4rEb12aY+3h D9oGPCzcAqHhorktrjs6Yqj7RwaL8jSVp1PQFPRs4ieHkG6CRmAIMtbczLvckcuguY kx411NvbXz2WxWuj2Qk5HY79RDoChIhQCCQq2vKE= Subject: FAILED: patch "[PATCH] nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD" failed to apply to 5.15-stable tree To: dory@dory.moe, hch@lst.de Cc: From: Date: Mon, 17 Apr 2023 10:02:05 +0200 Message-ID: <2023041705-dreaded-verify-10da@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 74391b3e69855e7dd65a9cef36baf5fc1345affd # git commit -s git send-email --to '' --in-reply-to '2023041705-dreaded-verify-10da@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 74391b3e6985 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD") 1231363aec86 ("nvme-pci: mark Lexar NM760 as IGNORE_DEV_SUBNQN") 80b2624094c8 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM760") 200dccd07df2 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM610") d6c52fa3e955 ("nvme-pci: Crucial P2 has bogus namespace ids") 6b961bce50e4 ("nvme-pci: avoid the deepest sleep state on ZHITAI TiPro7000 SSDs") 3765fad50896 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for ADATA XPG GAMMIX S50") a98a945b80f8 ("nvme-pci: disable namespace identifiers for the MAXIO MAP1002/1202") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 74391b3e69855e7dd65a9cef36baf5fc1345affd Mon Sep 17 00:00:00 2001 From: Duy Truong Date: Thu, 13 Apr 2023 17:55:48 -0700 Subject: [PATCH] nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD Added a quirk to fix the TeamGroup T-Force Cardea Zero Z330 SSDs reporting duplicate NGUIDs. Signed-off-by: Duy Truong Cc: stable@vger.kernel.org Signed-off-by: Christoph Hellwig diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 282d808400c5..cd7873de3121 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -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),