Skip to content

Commit 382250f

Browse files
author
CKI KWF Bot
committed
Merge: rh_messages.h: add missing aacraid device
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1317 JIRA: https://issues.redhat.com/browse/RHEL-106859 Upstream Status: RHEL only An aacraid device was missing from our list of disabled devices and with this now updated we no longer need to include the RHEL only changes in drivers/scsi/aacraid/linit.c. Signed-off-by: Scott Weaver <scweaver@redhat.com> Approved-by: Tomas Henzl <thenzl@redhat.com> Approved-by: Chris Leech <cleech@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents f83a679 + 50229f1 commit 382250f

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

drivers/scsi/aacraid/linit.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
7777
* Note: The last field is used to index into aac_drivers below.
7878
*/
7979
static const struct pci_device_id aac_pci_tbl[] = {
80-
#ifndef CONFIG_RHEL_DIFFERENCES
8180
{ 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
8281
{ 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
8382
{ 0x1028, 0x0003, 0x1028, 0x0003, 0, 0, 2 }, /* PERC 3/Si (SlimFast/PERC3Si */
@@ -145,7 +144,6 @@ static const struct pci_device_id aac_pci_tbl[] = {
145144
{ 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */
146145
{ 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */
147146
{ 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 61 }, /* Adaptec NEMER/ARK Catch All */
148-
#endif
149147
{ 0x9005, 0x028b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 62 }, /* Adaptec PMC Series 6 (Tupelo) */
150148
{ 0x9005, 0x028c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 63 }, /* Adaptec PMC Series 7 (Denali) */
151149
{ 0x9005, 0x028d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 64 }, /* Adaptec PMC Series 8 */

kernel/rh_messages.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ static const struct pci_device_id rh_disabled_pci_devices[] = {
150150
{ 0x9005, 0x0285, 0x1014, 0x0312 },
151151
{ 0x9005, 0x0285, 0x1028, PCI_ANY_ID },
152152
{ 0x9005, 0x0285, 0x1028, 0x0287 },
153+
{ 0x9005, 0x0285, 0x1028, 0x0291 },
153154
{ 0x9005, 0x0285, 0x103C, 0x3227 },
154155
{ 0x9005, 0x0285, 0x17aa, PCI_ANY_ID },
155156
{ 0x9005, 0x0285, 0x17aa, 0x0286 },

0 commit comments

Comments
 (0)