drop queue-5.15/x86-amd_nb-use-family-19h-models-60h-7fh-function-4-ids.patch

diff --git a/queue-5.15/series b/queue-5.15/series
index d591fdf1168b9551a24143925306b5bdeb9fe8a4..f90b45d83aae49bb153574ac8803fbb8106d6a1a 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -263,6 +263,5 @@ fbdev-imsttfb-fix-error-path-of-imsttfb_probe.patch
 fbdev-imsttfb-fix-a-resource-leak-in-probe.patch
 fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch
 tracing-kprobes-fix-the-order-of-argument-descriptio.patch
-x86-amd_nb-use-family-19h-models-60h-7fh-function-4-ids.patch
 revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch
 btrfs-use-u64-for-buffer-sizes-in-the-tree-search-io.patch

diff --git a/queue-5.15/x86-amd_nb-use-family-19h-models-60h-7fh-function-4-ids.patch b/queue-5.15/x86-amd_nb-use-family-19h-models-60h-7fh-function-4-ids.patch
deleted file mode 100644 (file)
index 9ce2f21..0000000
--- a/queue-5.15/x86-amd_nb-use-family-19h-models-60h-7fh-function-4-ids.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2a565258b3f4bbdc7a3c09cd02082cb286a7bffc Mon Sep 17 00:00:00 2001
-From: Yazen Ghannam <yazen.ghannam@amd.com>
-Date: Thu, 3 Aug 2023 10:04:30 -0500
-Subject: x86/amd_nb: Use Family 19h Models 60h-7Fh Function 4 IDs
-
-From: Yazen Ghannam <yazen.ghannam@amd.com>
-
-commit 2a565258b3f4bbdc7a3c09cd02082cb286a7bffc upstream.
-
-Three PCI IDs for DF Function 4 were defined but not used.
-
-Add them to the "link" list.
-
-Fixes: f8faf3496633 ("x86/amd_nb: Add AMD PCI IDs for SMN communication")
-Fixes: 23a5b8bb022c ("x86/amd_nb: Add PCI ID for family 19h model 78h")
-Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/20230803150430.3542854-1-yazen.ghannam@amd.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/kernel/amd_nb.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
-index 10c2a3c9114e..43238ac2e845 100644
---- a/arch/x86/kernel/amd_nb.c
-+++ b/arch/x86/kernel/amd_nb.c
-@@ -116,6 +116,9 @@ static const struct pci_device_id amd_nb_link_ids[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F4) },
-       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F4) },
-       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) },
-+      { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F4) },
-+      { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F4) },
-+      { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F4) },
-       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
-       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) },
-       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) },
--- 
-2.42.1
-