From d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 23 Apr 2020 16:47:21 -0400 Subject: kernel-5.7.0-0.rc2.20200423git7adc4b399952.1 * Thu Apr 23 2020 CKI@GitLab [5.7.0-0.rc2.20200423git7adc4b399952.1] - 7adc4b399952 rebase - Match template format in kernel.spec.template ("Justin M. Forbes") - Break out the Patches into individual files for dist-git ("Justin M. Forbes") - Break the Red Hat patch into individual commits (Jeremy Cline) - Adjust module filtering so CONFIG_DRM_DP_CEC can be set (Jeremy Cline) - Add a script to generate release tags and branches (Jeremy Cline) - Set CONFIG_VDPA for fedora ("Justin M. Forbes") - Provide defaults in ark-rebase-patches.sh (Jeremy Cline) - Default ark-rebase-patches.sh to not report issues (Jeremy Cline) Resolves: rhbz# Signed-off-by: Jeremy Cline --- ...ove-depreciated-device-and-vendor-PCI-id-.patch | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch (limited to '0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch') diff --git a/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch b/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch new file mode 100644 index 000000000..5dd51c7d0 --- /dev/null +++ b/0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch @@ -0,0 +1,51 @@ +From f5388f57ed6302459fc47be74a76b9ff27fb822b Mon Sep 17 00:00:00 2001 +From: Raghava Aditya Renukunta +Date: Thu, 2 Jan 2020 14:24:38 -0500 +Subject: [PATCH] aacraid: Remove depreciated device and vendor PCI id's + +Message-id: <20180315040041.9449.8525.stgit@dhcp187-32.khw.lab.eng.bos.redhat.com> +Patchwork-id: 206793 +O-Subject: [RHEL8 e-stor PATCH] scsi: aacraid: Remove depreciated device and vendor PCI id's +Bugzilla: 1495307 +RH-Acked-by: Maurizio Lombardi +RH-Acked-by: Tomas Henzl + +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id95307 +Brew Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID552286 +Upstream Status: N/A (RHEL 8 internal) +Tested: Code Review + +Remove Vendor PCI ID and Device PCI ID of depreciated devices from +aacraid pci table, preventing these device from attaching to the aacraid +driver. + +Upstream Status: RHEL only +Signed-off-by: Raghava Aditya Renukunta +Signed-off-by: Herton R. Krzesinski +--- + drivers/scsi/aacraid/linit.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c +index 83a60b0a8cd8..9efb63c83234 100644 +--- a/drivers/scsi/aacraid/linit.c ++++ b/drivers/scsi/aacraid/linit.c +@@ -78,6 +78,7 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION; + * Note: The last field is used to index into aac_drivers below. + */ + static const struct pci_device_id aac_pci_tbl[] = { ++#ifndef CONFIG_RHEL_DIFFERENCES + { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */ + { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */ + { 0x1028, 0x0003, 0x1028, 0x0003, 0, 0, 2 }, /* PERC 3/Si (SlimFast/PERC3Si */ +@@ -145,6 +146,7 @@ static const struct pci_device_id aac_pci_tbl[] = { + { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */ + { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */ + { 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 61 }, /* Adaptec NEMER/ARK Catch All */ ++#endif + { 0x9005, 0x028b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 62 }, /* Adaptec PMC Series 6 (Tupelo) */ + { 0x9005, 0x028c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 63 }, /* Adaptec PMC Series 7 (Denali) */ + { 0x9005, 0x028d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 64 }, /* Adaptec PMC Series 8 */ +-- +2.26.0 + -- cgit