diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-24 05:31:22 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-24 05:56:43 +0200 |
commit | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (patch) | |
tree | 5a62f9127c7daa3d8f96e1394ef74421a7fb53e7 /0001-megaraid_sas-remove-deprecated-pci-ids.patch | |
parent | 536dec0b3393550051e61fc345aede447477bf94 (diff) | |
parent | d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (diff) | |
download | kernel-837cd03f031f1daaa2dda23d584cda25b0dfd51e.tar.gz kernel-837cd03f031f1daaa2dda23d584cda25b0dfd51e.tar.xz kernel-837cd03f031f1daaa2dda23d584cda25b0dfd51e.zip |
merge masterkernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc33kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc32kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc31kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc30
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, 47 insertions, 0 deletions
diff --git a/0001-megaraid_sas-remove-deprecated-pci-ids.patch b/0001-megaraid_sas-remove-deprecated-pci-ids.patch new file mode 100644 index 000000000..eec133f0a --- /dev/null +++ b/0001-megaraid_sas-remove-deprecated-pci-ids.patch @@ -0,0 +1,47 @@ +From efa70639e722576719dfa980da086ab20ba8a3b7 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 babe85d7b537..9b4df28defd2 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.26.0 + |