From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CCA707083C for ; Mon, 27 Apr 2026 16:38:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777307925; cv=none; b=T543SOT+Vgx7BF52uI0JKagyrPMkB59eg3K80D4S1JkoaK7xkKSfCeRlquHebR4WMJLltX1/nZP8VnuIuR6lcCOm8eOH46zIoWXdc90NQPuV0swCgriDby89T7bvK1zislQqd2lSWU/xcZwNOsHtbAMTqOgLeDedLM3SXYyHp1Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777307925; c=relaxed/simple; bh=yuR4CSRGHo0lr3yVaO1kFh/1Apt9Sexz6Z0VwtTyyj8=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Tn6AdNTfiGcp2zl35ECdHEfqkqgcBG0j/veL1HS9cXbTvv8/l7IklEv9v5Aiu98PEAF0Z4fYrD3dwOLxPtf2OGgUyFICzvqxbTW+x/MdVizbdyrWXWHwiyAZu+Pgm8jSuB9nL4lNT9pi49Ne7cA51R6cb2IyYduQWX4e45eCs2Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=S+tDnzdN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="S+tDnzdN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8265EC2BCB4; Mon, 27 Apr 2026 16:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777307925; bh=yuR4CSRGHo0lr3yVaO1kFh/1Apt9Sexz6Z0VwtTyyj8=; h=Subject:To:Cc:From:Date:From; b=S+tDnzdNYQq9q0UUgDgkjnuRPo2rzSjFAW4WWuVefd2n9ZxMx5l3G7iBGhR7ELFKz e90cMm5VFqSL+DsFCMlrov6u0vCHn5H97Z9ErwwDO9K1kBldTdSX8OltmmQEM1g2b5 7vh0nBSmdnsOlbPeFPrNqcXr0ivNzy/TaPy0366A= Subject: FAILED: patch "[PATCH] mei: me: add nova lake point H DID" failed to apply to 6.18-stable tree To: alexander.usyskin@intel.com,gregkh@linuxfoundation.org,stable@kernel.org,tomasw@gmail.com Cc: From: Date: Mon, 27 Apr 2026 10:38:01 -0600 Message-ID: <2026042701-singular-disaster-12a5@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-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-6.18.y git checkout FETCH_HEAD git cherry-pick -x a5a1804332afc7035d5c5b880548262e81d796bc # git commit -s git send-email --to '' --in-reply-to '2026042701-singular-disaster-12a5@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a5a1804332afc7035d5c5b880548262e81d796bc Mon Sep 17 00:00:00 2001 From: Alexander Usyskin Date: Sun, 5 Apr 2026 17:17:58 +0300 Subject: [PATCH] mei: me: add nova lake point H DID Add Nova Lake H device id. Cc: stable Co-developed-by: Tomas Winkler Signed-off-by: Tomas Winkler Signed-off-by: Alexander Usyskin Link: https://patch.msgid.link/20260405141758.1634556-1-alexander.usyskin@intel.com Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h index 9b1675f98404..f145e8e36cb3 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -123,6 +123,7 @@ #define PCI_DEVICE_ID_INTEL_MEI_WCL_P 0x4D70 /* Wildcat Lake P */ #define PCI_DEVICE_ID_INTEL_MEI_NVL_S 0x6E68 /* Nova Lake Point S */ +#define PCI_DEVICE_ID_INTEL_MEI_NVL_H 0xD370 /* Nova Lake Point H */ #define PCI_DEVICE_ID_INTEL_MEI_CRI 0x6766 /* Crescent Island */ diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index 8d16bfa6027c..9efeafa8f1ca 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -131,6 +131,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {PCI_DEVICE_DATA(INTEL, MEI_WCL_P, MEI_ME_PCH15_CFG)}, {PCI_DEVICE_DATA(INTEL, MEI_NVL_S, MEI_ME_PCH15_CFG)}, + {PCI_DEVICE_DATA(INTEL, MEI_NVL_H, MEI_ME_PCH15_CFG)}, /* required last entry */ {0, }