diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-10-07 09:54:44 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-10-07 09:54:44 -0500 |
commit | f7a55ba381de17d8e5511a97441944b797aa62a5 (patch) | |
tree | df2cb85063e94e396b776ea25c0e4b5f9f286c39 /0001-megaraid_sas-remove-deprecated-pci-ids.patch | |
parent | 5f7d08ee5f8b230f5dfb20783ec265ef40387520 (diff) | |
download | kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.tar.gz kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.tar.xz kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.zip |
kernel-5.9.0-0.rc8.20201007git7575fdda569b.29
* Wed Oct 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc8.20201007git7575fdda569b.29]
- Merge ark-patches
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-megaraid_sas-remove-deprecated-pci-ids.patch')
-rw-r--r-- | 0001-megaraid_sas-remove-deprecated-pci-ids.patch | 47 |
1 files changed, 0 insertions, 47 deletions
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 <thenzl@redhat.com> -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 <mlombard@redhat.com> -RH-Acked-by: Chris Leech <cleech@redhat.com> - -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 <herton@redhat.com> ---- - 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 - |