diff --git a/SOURCES/0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch b/SOURCES/0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
new file mode 100644
index 0000000..ae8a77c
--- /dev/null
+++ b/SOURCES/0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
@@ -0,0 +1,34 @@
+From 8d7b7932737d194297b2c6645610bb1320aafe09 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Sat, 16 Mar 2024 10:04:53 -0400
+Subject: [PATCH 1/3] Bring back deprecated pci ids to mpt3sas driver
+
+---
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+index 55b802829..fc305da99 100644
+--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
++++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+@@ -12065,7 +12065,7 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev)
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_RHEL_DIFFERENCES
++#ifdef CONFIG_ALMALINUX_DIFFERENCES
+ static const struct pci_device_id rh_deprecated_pci_table[] = {
+ 	/* Thunderbolt ~ 2208 */
+ 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1,
+@@ -12139,7 +12139,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+ 	int rv;
+ 	u16 hba_mpi_version;
+ 
+-#ifdef CONFIG_RHEL_DIFFERENCES
++#ifdef CONFIG_ALMALINUX_DIFFERENCES
+ 	if (pci_hw_disabled(rh_disabled_pci_table, pdev))
+ 		return -ENODEV;
+ 
+-- 
+2.39.3
+
diff --git a/SOURCES/0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch b/SOURCES/0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
new file mode 100644
index 0000000..0e8de9f
--- /dev/null
+++ b/SOURCES/0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
@@ -0,0 +1,41 @@
+From 057542c13694ac90dc4531f5c0776f53a6f6e891 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Sat, 16 Mar 2024 10:11:02 -0400
+Subject: [PATCH 2/3] Bring back deprecated pci ids to megaraid_sas driver
+
+---
+ drivers/scsi/megaraid/megaraid_sas_base.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
+index e75f2588a..d8bd623f6 100644
+--- a/drivers/scsi/megaraid/megaraid_sas_base.c
++++ b/drivers/scsi/megaraid/megaraid_sas_base.c
+@@ -140,12 +140,24 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance);
+  */
+ static struct pci_device_id megasas_pci_table[] = {
+ 
++	{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)},
++	/* ppc IOP */
++	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078DE)},
++	/* ppc IOP */
++	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078GEN2)},
++	/* gen2*/
+ 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0079GEN2)},
+ 	/* gen2*/
+ 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0073SKINNY)},
+ 	/* skinny*/
+ 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0071SKINNY)},
+ 	/* skinny*/
++	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)},
++	/* xscale IOP, vega */
++	{PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
++	/* xscale IOP */
+ 	{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.39.3
+
diff --git a/SOURCES/0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch b/SOURCES/0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
new file mode 100644
index 0000000..ef47fc4
--- /dev/null
+++ b/SOURCES/0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
@@ -0,0 +1,65 @@
+From 33e9e344ec9ffb7cf9d949c69420328df5fe4b29 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Sat, 16 Mar 2024 10:19:11 -0400
+Subject: [PATCH 3/3] Bring back deprecated pci ids to mptsas-mptspi driver
+
+---
+ drivers/message/fusion/mptsas.c | 12 +++++++++++-
+ drivers/message/fusion/mptspi.c | 10 +++++-----
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
+index a4666d02a..e4e41a5d3 100644
+--- a/drivers/message/fusion/mptsas.c
++++ b/drivers/message/fusion/mptsas.c
+@@ -5355,8 +5355,18 @@ static void mptsas_remove(struct pci_dev *pdev)
+ }
+ 
+ static struct pci_device_id mptsas_pci_table[] = {
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064,
++		PCI_ANY_ID, PCI_ANY_ID },
+ 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
+-		PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064E,
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068E,
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1078,
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP,
++		PCI_ANY_ID, PCI_ANY_ID },
+ 	{0}	/* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(pci, mptsas_pci_table);
+diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
+index 08acc09f7..9a336a161 100644
+--- a/drivers/message/fusion/mptspi.c
++++ b/drivers/message/fusion/mptspi.c
+@@ -1245,7 +1245,11 @@ static struct spi_function_template mptspi_transport_functions = {
+ 
+ static struct pci_device_id mptspi_pci_table[] = {
+ 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
+-		PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_ATTO, MPI_MANUFACTPAGE_DEVID_53C1030,
++		PCI_ANY_ID, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1035,
++		PCI_ANY_ID, PCI_ANY_ID },
+ 	{0}	/* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
+@@ -1536,10 +1540,6 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+ 		    0, 0, 0, 0, 5);
+ 
+ 	scsi_scan_host(sh);
+-
+-	add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
+-	pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n");
+-
+ 	return 0;
+ 
+ out_mptspi_probe:
+-- 
+2.39.3
+
diff --git a/SOURCES/0004-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch b/SOURCES/0004-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch
new file mode 100644
index 0000000..3bd0bbe
--- /dev/null
+++ b/SOURCES/0004-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch
@@ -0,0 +1,34 @@
+From cc44846ebd353aa4a95aaf014234dd00bdda3f93 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Sat, 16 Mar 2024 13:54:04 -0400
+Subject: [PATCH 4/6] Bring back deprecated pci ids to aacraid driver
+
+---
+ drivers/scsi/aacraid/linit.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
+index dffed227f..49f9d081c 100644
+--- a/drivers/scsi/aacraid/linit.c
++++ b/drivers/scsi/aacraid/linit.c
+@@ -85,7 +85,7 @@ static LIST_HEAD(aac_devices);
+ static int aac_cfg_major = AAC_CHARDEV_UNREGISTERED;
+ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
+ 
+-#ifdef CONFIG_RHEL_DIFFERENCES
++#ifdef CONFIG_ALMALINUX_DIFFERENCES
+ static const struct pci_device_id rh_deprecated_pci_table[] = {
+ 
+ 	{0}     /* Terminating entry */
+@@ -1778,7 +1778,7 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
+ 	int mask_bits = 0;
+ 	extern int aac_sync_mode;
+ 
+-#ifdef CONFIG_RHEL_DIFFERENCES
++#ifdef CONFIG_ALMALINUX_DIFFERENCES
+ 	if (pci_hw_disabled(rh_disabled_pci_table, pdev))
+ 		return -ENODEV;
+ 
+-- 
+2.39.3
+
diff --git a/SOURCES/0005-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch b/SOURCES/0005-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
new file mode 100644
index 0000000..196dabd
--- /dev/null
+++ b/SOURCES/0005-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
@@ -0,0 +1,49 @@
+From ae2a3882e8ea0ef04ed2c0e29d8b725d19dfafd6 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Sat, 16 Mar 2024 14:09:29 -0400
+Subject: [PATCH 5/6] Bring back deprecated pci ids to hpsa driver
+
+---
+ drivers/scsi/hpsa.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
+index db7e1af75..cc592f8f9 100644
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -91,6 +91,11 @@ MODULE_PARM_DESC(hpsa_simple_mode,
+ 
+ /* define the PCI info for the cards we can control */
+ static const struct pci_device_id hpsa_pci_device_id[] = {
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3223},
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3234},
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3235},
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x3237},
++	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSC,     0x103C, 0x323D},
+ 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3241},
+ 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3243},
+ 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3245},
+@@ -144,6 +149,10 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
+ 	{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D},
+ 	{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0088},
+ 	{PCI_VENDOR_ID_HP, 0x333f, 0x103c, 0x333f},
++	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,
++		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
++	{PCI_VENDOR_ID_COMPAQ,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,
++		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
+ 	{0,}
+ };
+ 
+@@ -8652,9 +8661,6 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+ 	unsigned long flags;
+ 	u32 board_id;
+ 
+-#ifdef CONFIG_RHEL_DIFFERENCES
+-	pci_hw_deprecated(hpsa_pci_device_id, pdev);
+-#endif
+ 
+ 	if (number_of_controllers == 0)
+ 		printk(KERN_INFO DRIVER_NAME "\n");
+-- 
+2.39.3
+
diff --git a/SOURCES/0006-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch b/SOURCES/0006-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
new file mode 100644
index 0000000..ec18017
--- /dev/null
+++ b/SOURCES/0006-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
@@ -0,0 +1,194 @@
+From b4c30dab126e13e0968b01c9e0dcbda7f95cc384 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Sat, 16 Mar 2024 15:02:12 -0400
+Subject: [PATCH 6/6] Bring back deprecated pci ids to qla2xxx driver
+
+---
+ drivers/scsi/qla2xxx/qla_os.c | 124 +++++++++++++++++++++++++++++++++-
+ 1 file changed, 121 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
+index 9e4746639..468600adb 100644
+--- a/drivers/scsi/qla2xxx/qla_os.c
++++ b/drivers/scsi/qla2xxx/qla_os.c
+@@ -2620,6 +2620,73 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
+ {
+ 	ha->device_type = DT_EXTENDED_IDS;
+ 	switch (ha->pdev->device) {
++	case PCI_DEVICE_ID_QLOGIC_ISP2100:
++		ha->isp_type |= DT_ISP2100;
++		ha->device_type &= ~DT_EXTENDED_IDS;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2100;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2200:
++		ha->isp_type |= DT_ISP2200;
++		ha->device_type &= ~DT_EXTENDED_IDS;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2100;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2300:
++		ha->isp_type |= DT_ISP2300;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2300;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2312:
++		ha->isp_type |= DT_ISP2312;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2300;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2322:
++		ha->isp_type |= DT_ISP2322;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		if (ha->pdev->subsystem_vendor == 0x1028 &&
++		    ha->pdev->subsystem_device == 0x0170)
++			ha->device_type |= DT_OEM_001;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2300;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP6312:
++		ha->isp_type |= DT_ISP6312;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2300;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP6322:
++		ha->isp_type |= DT_ISP6322;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2300;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2422:
++		ha->isp_type |= DT_ISP2422;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->device_type |= DT_IIDMA;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP2432:
++		ha->isp_type |= DT_ISP2432;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->device_type |= DT_IIDMA;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP8432:
++		ha->isp_type |= DT_ISP8432;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->device_type |= DT_IIDMA;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP5422:
++		ha->isp_type |= DT_ISP5422;
++		ha->device_type |= DT_FWI2;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP5432:
++		ha->isp_type |= DT_ISP5432;
++		ha->device_type |= DT_FWI2;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
+ 	case PCI_DEVICE_ID_QLOGIC_ISP2532:
+ 		ha->isp_type |= DT_ISP2532;
+ 		ha->device_type |= DT_ZIO_SUPPORTED;
+@@ -2627,6 +2694,29 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
+ 		ha->device_type |= DT_IIDMA;
+ 		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
+ 		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP8001:
++		ha->isp_type |= DT_ISP8001;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->device_type |= DT_IIDMA;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		break;
++	case PCI_DEVICE_ID_QLOGIC_ISP8021:
++		ha->isp_type |= DT_ISP8021;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		/* Initialize 82XX ISP flags */
++		qla82xx_init_flags(ha);
++		break;
++	 case PCI_DEVICE_ID_QLOGIC_ISP8044:
++		ha->isp_type |= DT_ISP8044;
++		ha->device_type |= DT_ZIO_SUPPORTED;
++		ha->device_type |= DT_FWI2;
++		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
++		/* Initialize 82XX ISP flags */
++		qla82xx_init_flags(ha);
++		break;
+ 	case PCI_DEVICE_ID_QLOGIC_ISP2031:
+ 		ha->isp_type |= DT_ISP2031;
+ 		ha->device_type |= DT_ZIO_SUPPORTED;
+@@ -2643,6 +2733,9 @@ qla2x00_set_isp_flags(struct qla_hw_data *ha)
+ 		ha->device_type |= DT_T10_PI;
+ 		ha->fw_srisc_address = RISC_START_ADDRESS_2400;
+ 		break;
++	case PCI_DEVICE_ID_QLOGIC_ISPF001:
++		ha->isp_type |= DT_ISPFX00;
++		break;
+ 	case PCI_DEVICE_ID_QLOGIC_ISP2071:
+ 		ha->isp_type |= DT_ISP2071;
+ 		ha->device_type |= DT_ZIO_SUPPORTED;
+@@ -2765,7 +2858,7 @@ static void qla2x00_iocb_work_fn(struct work_struct *work)
+ 	spin_unlock_irqrestore(&vha->work_lock, flags);
+ }
+ 
+-#ifdef CONFIG_RHEL_DIFFERENCES
++#ifdef CONFIG_ALMALINUX_DIFFERENCES
+ static const struct pci_device_id rh_deprecated_pci_table[] = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) },
+@@ -2801,7 +2894,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
+ 	struct rsp_que *rsp = NULL;
+ 	int i;
+ 
+-#ifdef CONFIG_RHEL_DIFFERENCES
++#ifdef CONFIG_ALMALINUX_DIFFERENCES
+ 	if (pci_hw_disabled(rh_disabled_pci_table, pdev))
+ 		return -ENODEV;
+ 
+@@ -2811,9 +2904,18 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
+ 
+ 	bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);
+ 	sht = &qla2xxx_driver_template;
+-	if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2532 ||
++	if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2422 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2432 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8432 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5422 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5432 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2532 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8001 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8021 ||
+ 	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2031 ||
+ 	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8031 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISPF001 ||
++	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP8044 ||
+ 	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2071 ||
+ 	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2271 ||
+ 	    pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2261 ||
+@@ -7986,9 +8088,25 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
+ };
+ 
+ static struct pci_device_id qla2xxx_pci_tbl[] = {
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2312) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2322) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6312) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP6322) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2422) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2432) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8001) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8021) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISPF001) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2071) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) },
+-- 
+2.39.3
+
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index db0b358..fd86e90 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -526,6 +526,14 @@ Patch999999: linux-kernel-test.patch
 Patch1000: debrand-single-cpu.patch
 Patch1002: debrand-rh-i686-cpu.patch
 
+# Bring back deprecated PCI ids #CFHack #CFHack2024
+Patch2001: 0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
+Patch2002: 0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
+Patch2003: 0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
+Patch2004: 0004-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch
+Patch2005: 0005-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
+Patch2006: 0006-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/%{name}-%{KVERREL}-root
@@ -1091,6 +1099,14 @@ cd linux-%{KVERREL}
 
 ApplyOptionalPatch debrand-single-cpu.patch
 ApplyOptionalPatch debrand-rh-i686-cpu.patch
+
+ApplyOptionalPatch 0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
+ApplyOptionalPatch 0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
+ApplyOptionalPatch 0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
+ApplyOptionalPatch 0004-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch
+ApplyOptionalPatch 0005-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
+ApplyOptionalPatch 0006-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
+
 ApplyOptionalPatch linux-kernel-test.patch
 
 # END OF PATCH APPLICATIONS
@@ -2687,6 +2703,14 @@ fi
 #
 #
 %changelog
+* Sat Mar 16 2024 Andrew Lukoshko <alukoshko@almalinux.org> [4.18.0-513.el8]
+- aacraid: bring back deprecated PCI ids #CFHack #CFHack2024
+- hpsa: bring back deprecated PCI ids #CFHack #CFHack2024
+- mptsas: bring back deprecated PCI ids #CFHack #CFHack2024
+- mpt3sas: bring back deprecated PCI ids #CFHack #CFHack2024
+- megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024
+- qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024
+
 * Fri Aug 25 2023 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-513.el8]
 - redhat/configs: enable CONFIG_INET_DIAG_DESTROY (Andrea Claudi) [2230213]
 - net/sched: cls_u32: Fix reference counter leak leading to overflow (Davide Caratti) [2225202] {CVE-2023-3609}