From f7a55ba381de17d8e5511a97441944b797aa62a5 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 7 Oct 2020 09:54:44 -0500 Subject: kernel-5.9.0-0.rc8.20201007git7575fdda569b.29 * Wed Oct 07 2020 Fedora Kernel Team [5.9.0-0.rc8.20201007git7575fdda569b.29] - Merge ark-patches Resolves: rhbz# Signed-off-by: Justin M. Forbes --- 0001-megaraid_sas-remove-deprecated-pci-ids.patch | 47 ----------------------- 1 file changed, 47 deletions(-) delete mode 100644 0001-megaraid_sas-remove-deprecated-pci-ids.patch (limited to '0001-megaraid_sas-remove-deprecated-pci-ids.patch') diff --git a/0001-megaraid_sas-remove-deprecated-pci-ids.patch b/0001-megaraid_sas-remove-deprecated-pci-ids.patch deleted file mode 100644 index 292a1fe53..000000000 --- a/0001-megaraid_sas-remove-deprecated-pci-ids.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tomas Henzl -Date: Thu, 2 Jan 2020 14:24:37 -0500 -Subject: [PATCH] megaraid_sas: remove deprecated pci-ids - -Message-id: <20180403143030.4971-2-thenzl@redhat.com> -Patchwork-id: 7432 -O-Subject: [kernel team] [RHEL8 e-stor PATCH] megaraid_sas: remove deprecated pci-ids -Bugzilla: 1509329 -RH-Acked-by: Maurizio Lombardi -RH-Acked-by: Chris Leech - -bz#1509329 -brew - task_15594743 - -RH specific - remove EOL devices from the pci-id table -(devices to remove were selected by Broadcom) - -Upstream Status: RHEL only -Signed-off-by: Herton R. Krzesinski ---- - drivers/scsi/megaraid/megaraid_sas_base.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c -index 861f7140f52e..8c08ca7954a4 100644 ---- a/drivers/scsi/megaraid/megaraid_sas_base.c -+++ b/drivers/scsi/megaraid/megaraid_sas_base.c -@@ -133,6 +133,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance, - */ - static struct pci_device_id megasas_pci_table[] = { - -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)}, - /* xscale IOP */ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)}, -@@ -151,6 +152,7 @@ static struct pci_device_id megasas_pci_table[] = { - /* xscale IOP, vega */ - {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)}, - /* xscale IOP */ -+#endif - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FUSION)}, - /* Fusion */ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, --- -2.28.0 - -- cgit