diff --git a/.kernel-rt.metadata b/.kernel-rt.metadata
index 7f82522..e25e3c9 100644
--- a/.kernel-rt.metadata
+++ b/.kernel-rt.metadata
@@ -1,6 +1,6 @@
 2ba40bf9138b48311e5aa1b737b7f0a8ad66066f SOURCES/centossecureboot201.cer
 bfdb3d7cffc43f579655af5155d50c08671d95e5 SOURCES/centossecurebootca2.cer
-a9e6b45cfbe8e2993bd6cacee42e0f67ccc77cb7 SOURCES/linux-4.18.0-513.24.1.rt7.326.el8_9.tar.xz
+5b1daa8c998a7d55be920ede75b14bc707dcf887 SOURCES/linux-4.18.0-544.rt7.333.el8.tar.xz
 13e5cd3f856b472fde80a4deb75f4c18dfb5b255 SOURCES/redhatsecureboot302.cer
 e89890ca0ded2f9058651cc5fa838b78db2e6cc2 SOURCES/redhatsecureboot303.cer
 ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
@@ -8,3 +8,5 @@ cf9230e69000076727e5b784ec871d22716dc5da SOURCES/redhatsecurebootca3.cer
 905d91a282727c7f5ad433a49ac42a0772311c6a SOURCES/redhatsecurebootca7.cer
 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
+6fd8d9d4fd8cd8a9c40cc9d3d24a2d2501369869 SOURCES/msvspheredup1.x509
+ec8fefbe48fe852ade37c1c0683b1796605ba19f SOURCES/msvspherepatch1.x509
diff --git a/SOURCES/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch b/SOURCES/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch
new file mode 100644
index 0000000..4e0b597
--- /dev/null
+++ b/SOURCES/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch
@@ -0,0 +1,45 @@
+From b69db7bed679288a9107d652fd39076dc4dea85c Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Mon, 8 Apr 2024 20:50:39 +0000
+Subject: [PATCH 1/5] Enable all disabled pci devices by moving to unmaintained
+ list
+
+---
+ kernel/rh_messages.h | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h
+index b7c3be8aa..28b0f3cad 100644
+--- a/kernel/rh_messages.h
++++ b/kernel/rh_messages.h
+@@ -149,6 +149,14 @@ static const struct pci_device_id rh_deprecated_pci_devices[] = {
+ };
+ 
+ static const struct pci_device_id rh_disabled_pci_devices[] = {
++	{0}     /* Terminating entry */
++};
++
++static const struct pci_device_id rh_unmaintained_pci_devices[] = {
++	{ 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID },
++	{ 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID },
++	{ 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID },
++	{ 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID },
+ 	{ 0x1011, 0x0046, 0x103c, 0x10c2 },
+ 	{ 0x1011, 0x0046, 0x9005, 0x0364 },
+ 	{ 0x1011, 0x0046, 0x9005, 0x0365 },
+@@ -301,12 +309,4 @@ static const struct pci_device_id rh_disabled_pci_devices[] = {
+ 	{0}     /* Terminating entry */
+ };
+ 
+-static const struct pci_device_id rh_unmaintained_pci_devices[] = {
+-	{ 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID },
+-	{ 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID },
+-	{ 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID },
+-	{ 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID },
+-	{0}     /* Terminating entry */
+-};
+-
+ #endif /* __RH_MESSAGES_H */
+-- 
+2.27.0
+
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..148d3c4
--- /dev/null
+++ b/SOURCES/0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
@@ -0,0 +1,41 @@
+From 50d7888356a1ea1418f15ac75b25457b6d7b3dd8 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Mon, 8 Apr 2024 20:55:37 +0000
+Subject: [PATCH 2/5] 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 19a62e595..4ecd40872 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.27.0
+
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..b8b9d50
--- /dev/null
+++ b/SOURCES/0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
@@ -0,0 +1,65 @@
+From 8a5b922edcc3b2973395d4d5407b143ae1d87552 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Mon, 8 Apr 2024 20:59:22 +0000
+Subject: [PATCH 3/5] 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 652fed3f8..4c73bf444 100644
+--- a/drivers/message/fusion/mptsas.c
++++ b/drivers/message/fusion/mptsas.c
+@@ -5353,8 +5353,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.27.0
+
diff --git a/SOURCES/0004-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch b/SOURCES/0004-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
new file mode 100644
index 0000000..96e97d5
--- /dev/null
+++ b/SOURCES/0004-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
@@ -0,0 +1,39 @@
+From 01c67e991c0d49e797b412d6d6f4d7a4669ec926 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Mon, 8 Apr 2024 21:01:23 +0000
+Subject: [PATCH 4/5] Bring back deprecated pci ids to hpsa driver
+
+---
+ drivers/scsi/hpsa.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
+index 544f1ab02..2fa774488 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,}
+ };
+ 
+-- 
+2.27.0
+
diff --git a/SOURCES/0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch b/SOURCES/0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
new file mode 100644
index 0000000..da58f42
--- /dev/null
+++ b/SOURCES/0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
@@ -0,0 +1,176 @@
+From c74bb37d786dd12419fca217b53f33ca177fe96d Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Mon, 8 Apr 2024 21:07:42 +0000
+Subject: [PATCH 5/5] Bring back deprecated pci ids to qla2xxx driver
+
+---
+ drivers/scsi/qla2xxx/qla_os.c | 120 +++++++++++++++++++++++++++++++++-
+ 1 file changed, 119 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
+index 93dd9c332..8d46bbf22 100644
+--- a/drivers/scsi/qla2xxx/qla_os.c
++++ b/drivers/scsi/qla2xxx/qla_os.c
+@@ -2636,6 +2636,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;
+@@ -2643,6 +2710,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;
+@@ -2659,6 +2749,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;
+@@ -2802,9 +2895,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 ||
+@@ -7997,9 +8099,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.27.0
+
diff --git a/SOURCES/0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch b/SOURCES/0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
new file mode 100644
index 0000000..26f68c7
--- /dev/null
+++ b/SOURCES/0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
@@ -0,0 +1,408 @@
+From 1642dcf67a557b42609a3756e2be7537762c38ea Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Tue, 9 Apr 2024 21:02:31 +0000
+Subject: [PATCH] Bring back deprecated pci ids to lpfc driver
+
+---
+ drivers/scsi/lpfc/lpfc_attr.c |   6 ++
+ drivers/scsi/lpfc/lpfc_els.c  |   9 +++
+ drivers/scsi/lpfc/lpfc_hw.h   |  39 +++++++++-
+ drivers/scsi/lpfc/lpfc_ids.h  |  62 ++++++++++++++++
+ drivers/scsi/lpfc/lpfc_init.c | 136 +++++++++++++++++++++++++++++++++-
+ 5 files changed, 249 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
+index 8b15088a1..385ade242 100644
+--- a/drivers/scsi/lpfc/lpfc_attr.c
++++ b/drivers/scsi/lpfc/lpfc_attr.c
+@@ -7493,6 +7493,12 @@ lpfc_get_hba_function_mode(struct lpfc_hba *phba)
+ 	switch (phba->pcidev->device) {
+ 	case PCI_DEVICE_ID_SKYHAWK:
+ 	case PCI_DEVICE_ID_SKYHAWK_VF:
++	case PCI_DEVICE_ID_LANCER_FCOE:
++	case PCI_DEVICE_ID_LANCER_FCOE_VF:
++	case PCI_DEVICE_ID_ZEPHYR_DCSP:
++	case PCI_DEVICE_ID_HORNET:
++	case PCI_DEVICE_ID_TIGERSHARK:
++	case PCI_DEVICE_ID_TOMCAT:
+ 		phba->hba_flag |= HBA_FCOE_MODE;
+ 		break;
+ 	default:
+diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
+index 89d9f7fdb..700fe69a4 100644
+--- a/drivers/scsi/lpfc/lpfc_els.c
++++ b/drivers/scsi/lpfc/lpfc_els.c
+@@ -4608,6 +4608,15 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+ 	case IOSTAT_LOCAL_REJECT:
+ 		switch ((irsp->un.ulpWord[4] & IOERR_PARAM_MASK)) {
+ 		case IOERR_LOOP_OPEN_FAILURE:
++			if (cmd == ELS_CMD_FLOGI) {
++				if (PCI_DEVICE_ID_HORNET ==
++					phba->pcidev->device) {
++					phba->fc_topology = LPFC_TOPOLOGY_LOOP;
++					phba->pport->fc_myDID = 0;
++					phba->alpa_map[0] = 0;
++					phba->alpa_map[1] = 0;
++				}
++			}
+ 			if (cmd == ELS_CMD_PLOGI && cmdiocb->retry == 0)
+ 				delay = 1000;
+ 			retry = 1;
+diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
+index 474c594f8..240b688e1 100644
+--- a/drivers/scsi/lpfc/lpfc_hw.h
++++ b/drivers/scsi/lpfc/lpfc_hw.h
+@@ -1713,25 +1713,55 @@ struct lpfc_fdmi_reg_portattr {
+ 
+ /* Start FireFly Register definitions */
+ #define PCI_VENDOR_ID_EMULEX        0x10df
++#define PCI_DEVICE_ID_FIREFLY       0x1ae5
++#define PCI_DEVICE_ID_PROTEUS_VF    0xe100
++#define PCI_DEVICE_ID_BALIUS        0xe131
++#define PCI_DEVICE_ID_PROTEUS_PF    0xe180
+ #define PCI_DEVICE_ID_LANCER_FC     0xe200
++#define PCI_DEVICE_ID_LANCER_FC_VF  0xe208
+ #define PCI_DEVICE_ID_LANCER_FCOE   0xe260
++#define PCI_DEVICE_ID_LANCER_FCOE_VF 0xe268
+ #define PCI_DEVICE_ID_LANCER_G6_FC  0xe300
+ #define PCI_DEVICE_ID_LANCER_G7_FC  0xf400
+ #define PCI_DEVICE_ID_LANCER_G7P_FC 0xf500
+ #define PCI_DEVICE_ID_SAT_SMB       0xf011
+ #define PCI_DEVICE_ID_SAT_MID       0xf015
++#define PCI_DEVICE_ID_RFLY          0xf095
++#define PCI_DEVICE_ID_PFLY          0xf098
++#define PCI_DEVICE_ID_LP101         0xf0a1
++#define PCI_DEVICE_ID_TFLY          0xf0a5
++#define PCI_DEVICE_ID_BSMB          0xf0d1
+ #define PCI_DEVICE_ID_BMID          0xf0d5
+ #define PCI_DEVICE_ID_ZSMB          0xf0e1
+ #define PCI_DEVICE_ID_ZMID          0xf0e5
++#define PCI_DEVICE_ID_NEPTUNE       0xf0f5
++#define PCI_DEVICE_ID_NEPTUNE_SCSP  0xf0f6
++#define PCI_DEVICE_ID_NEPTUNE_DCSP  0xf0f7
+ #define PCI_DEVICE_ID_SAT           0xf100
+ #define PCI_DEVICE_ID_SAT_SCSP      0xf111
+ #define PCI_DEVICE_ID_SAT_DCSP      0xf112
+ #define PCI_DEVICE_ID_FALCON        0xf180
++#define PCI_DEVICE_ID_SUPERFLY      0xf700
++#define PCI_DEVICE_ID_DRAGONFLY     0xf800
++#define PCI_DEVICE_ID_CENTAUR       0xf900
++#define PCI_DEVICE_ID_PEGASUS       0xf980
++#define PCI_DEVICE_ID_THOR          0xfa00
++#define PCI_DEVICE_ID_VIPER         0xfb00
++#define PCI_DEVICE_ID_LP10000S      0xfc00
++#define PCI_DEVICE_ID_LP11000S      0xfc10
++#define PCI_DEVICE_ID_LPE11000S     0xfc20
+ #define PCI_DEVICE_ID_SAT_S         0xfc40
++#define PCI_DEVICE_ID_PROTEUS_S     0xfc50
++#define PCI_DEVICE_ID_HELIOS        0xfd00
++#define PCI_DEVICE_ID_HELIOS_SCSP   0xfd11
++#define PCI_DEVICE_ID_HELIOS_DCSP   0xfd12
+ #define PCI_DEVICE_ID_ZEPHYR        0xfe00
++#define PCI_DEVICE_ID_HORNET        0xfe05
+ #define PCI_DEVICE_ID_ZEPHYR_SCSP   0xfe11
+ #define PCI_DEVICE_ID_ZEPHYR_DCSP   0xfe12
+ #define PCI_VENDOR_ID_SERVERENGINE  0x19a2
++#define PCI_DEVICE_ID_TIGERSHARK    0x0704
++#define PCI_DEVICE_ID_TOMCAT        0x0714
+ #define PCI_DEVICE_ID_SKYHAWK       0x0724
+ #define PCI_DEVICE_ID_SKYHAWK_VF    0x072c
+ 
+@@ -4365,11 +4395,16 @@ struct lpfc_sli2_slim {
+ static inline int
+ lpfc_is_LC_HBA(unsigned short device)
+ {
+-	if ((device == PCI_DEVICE_ID_BMID) ||
++	if ((device == PCI_DEVICE_ID_TFLY) ||
++	    (device == PCI_DEVICE_ID_PFLY) ||
++	    (device == PCI_DEVICE_ID_LP101) ||
++	    (device == PCI_DEVICE_ID_BMID) ||
++	    (device == PCI_DEVICE_ID_BSMB) ||
+ 	    (device == PCI_DEVICE_ID_ZMID) ||
+ 	    (device == PCI_DEVICE_ID_ZSMB) ||
+ 	    (device == PCI_DEVICE_ID_SAT_MID) ||
+-	    (device == PCI_DEVICE_ID_SAT_SMB))
++	    (device == PCI_DEVICE_ID_SAT_SMB) ||
++	    (device == PCI_DEVICE_ID_RFLY))
+ 		return 1;
+ 	else
+ 		return 0;
+diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h
+index a77e0fac0..4e9b02a78 100644
+--- a/drivers/scsi/lpfc/lpfc_ids.h
++++ b/drivers/scsi/lpfc/lpfc_ids.h
+@@ -24,10 +24,44 @@
+ #include <linux/pci.h>
+ 
+ const struct pci_device_id lpfc_id_table[] = {
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_THOR,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PEGASUS,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_CENTAUR,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_DRAGONFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SUPERFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_RFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_SCSP,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_DCSP,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_SCSP,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,
+@@ -36,6 +70,16 @@ const struct pci_device_id lpfc_id_table[] = {
+ 		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP10000S,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP11000S,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
+@@ -48,10 +92,28 @@ const struct pci_device_id lpfc_id_table[] = {
+ 		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_S,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TIGERSHARK,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC_VF,
++		PCI_ANY_ID, PCI_ANY_ID, },
++	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF,
++		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G6_FC,
+ 		PCI_ANY_ID, PCI_ANY_ID, },
+ 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
+diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
+index 82d25ea51..f4f49aa2a 100644
+--- a/drivers/scsi/lpfc/lpfc_init.c
++++ b/drivers/scsi/lpfc/lpfc_init.c
+@@ -2482,9 +2482,83 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
+ 	vp = &phba->vpd;
+ 
+ 	switch (dev_id) {
++	case PCI_DEVICE_ID_FIREFLY:
++		m = (typeof(m)){"LP6000", "PCI",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_SUPERFLY:
++		if (vp->rev.biuRev >= 1 && vp->rev.biuRev <= 3)
++			m = (typeof(m)){"LP7000", "PCI", ""};
++		else
++			m = (typeof(m)){"LP7000E", "PCI", ""};
++		m.function = "Obsolete, Unsupported Fibre Channel Adapter";
++		break;
++	case PCI_DEVICE_ID_DRAGONFLY:
++		m = (typeof(m)){"LP8000", "PCI",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_CENTAUR:
++		if (FC_JEDEC_ID(vp->rev.biuRev) == CENTAUR_2G_JEDEC_ID)
++			m = (typeof(m)){"LP9002", "PCI", ""};
++		else
++			m = (typeof(m)){"LP9000", "PCI", ""};
++		m.function = "Obsolete, Unsupported Fibre Channel Adapter";
++		break;
++	case PCI_DEVICE_ID_RFLY:
++		m = (typeof(m)){"LP952", "PCI",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_PEGASUS:
++		m = (typeof(m)){"LP9802", "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_THOR:
++		m = (typeof(m)){"LP10000", "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_VIPER:
++		m = (typeof(m)){"LPX1000",  "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_PFLY:
++		m = (typeof(m)){"LP982", "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_TFLY:
++		m = (typeof(m)){"LP1050", "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_HELIOS:
++		m = (typeof(m)){"LP11000", "PCI-X2",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_HELIOS_SCSP:
++		m = (typeof(m)){"LP11000-SP", "PCI-X2",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_HELIOS_DCSP:
++		m = (typeof(m)){"LP11002-SP",  "PCI-X2",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_NEPTUNE:
++		m = (typeof(m)){"LPe1000", "PCIe",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_NEPTUNE_SCSP:
++		m = (typeof(m)){"LPe1000-SP", "PCIe",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_NEPTUNE_DCSP:
++		m = (typeof(m)){"LPe1002-SP", "PCIe",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
+ 	case PCI_DEVICE_ID_BMID:
+ 		m = (typeof(m)){"LP1150", "PCI-X2", "Fibre Channel Adapter"};
+ 		break;
++	case PCI_DEVICE_ID_BSMB:
++		m = (typeof(m)){"LP111", "PCI-X2",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
+ 	case PCI_DEVICE_ID_ZEPHYR:
+ 		m = (typeof(m)){"LPe11000", "PCIe", "Fibre Channel Adapter"};
+ 		break;
+@@ -2501,6 +2575,22 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
+ 	case PCI_DEVICE_ID_ZSMB:
+ 		m = (typeof(m)){"LPe111", "PCIe", "Fibre Channel Adapter"};
+ 		break;
++	case PCI_DEVICE_ID_LP101:
++		m = (typeof(m)){"LP101", "PCI-X",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_LP10000S:
++		m = (typeof(m)){"LP10000-S", "PCI",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_LP11000S:
++		m = (typeof(m)){"LP11000-S", "PCI-X2",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_LPE11000S:
++		m = (typeof(m)){"LPe11000-S", "PCIe",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
+ 	case PCI_DEVICE_ID_SAT:
+ 		m = (typeof(m)){"LPe12000", "PCIe", "Fibre Channel Adapter"};
+ 		break;
+@@ -2519,17 +2609,54 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
+ 	case PCI_DEVICE_ID_SAT_S:
+ 		m = (typeof(m)){"LPe12000-S", "PCIe", "Fibre Channel Adapter"};
+ 		break;
++	case PCI_DEVICE_ID_HORNET:
++		m = (typeof(m)){"LP21000", "PCIe",
++				"Obsolete, Unsupported FCoE Adapter"};
++		GE = 1;
++		break;
++	case PCI_DEVICE_ID_PROTEUS_VF:
++		m = (typeof(m)){"LPev12000", "PCIe IOV",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_PROTEUS_PF:
++		m = (typeof(m)){"LPev12000", "PCIe IOV",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_PROTEUS_S:
++		m = (typeof(m)){"LPemv12002-S", "PCIe IOV",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
++	case PCI_DEVICE_ID_TIGERSHARK:
++		oneConnect = 1;
++		m = (typeof(m)){"OCe10100", "PCIe", "FCoE"};
++		break;
++	case PCI_DEVICE_ID_TOMCAT:
++		oneConnect = 1;
++		m = (typeof(m)){"OCe11100", "PCIe", "FCoE"};
++		break;
+ 	case PCI_DEVICE_ID_FALCON:
+ 		m = (typeof(m)){"LPSe12002-ML1-E", "PCIe",
+ 				"EmulexSecure Fibre"};
+ 		break;
++	case PCI_DEVICE_ID_BALIUS:
++		m = (typeof(m)){"LPVe12002", "PCIe Shared I/O",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
+ 	case PCI_DEVICE_ID_LANCER_FC:
+ 		m = (typeof(m)){"LPe16000", "PCIe", "Fibre Channel Adapter"};
+ 		break;
++	case PCI_DEVICE_ID_LANCER_FC_VF:
++		m = (typeof(m)){"LPe16000", "PCIe",
++				"Obsolete, Unsupported Fibre Channel Adapter"};
++		break;
+ 	case PCI_DEVICE_ID_LANCER_FCOE:
++		oneConnect = 1;
++		m = (typeof(m)){"OCe15100", "PCIe", "FCoE"};
++		break;
++	case PCI_DEVICE_ID_LANCER_FCOE_VF:
+ 		oneConnect = 1;
+ 		m = (typeof(m)){"OCe15100", "PCIe",
+-				"Obsolete, Unsupported FCoE Adapter"};
++				"Obsolete, Unsupported FCoE"};
+ 		break;
+ 	case PCI_DEVICE_ID_LANCER_G6_FC:
+ 		m = (typeof(m)){"LPe32000", "PCIe", "Fibre Channel Adapter"};
+@@ -7619,6 +7746,13 @@ lpfc_sli_driver_resource_setup(struct lpfc_hba *phba)
+ 	if (rc)
+ 		return -ENODEV;
+ 
++	if (phba->pcidev->device == PCI_DEVICE_ID_HORNET) {
++		phba->menlo_flag |= HBA_MENLO_SUPPORT;
++		/* check for menlo minimum sg count */
++		if (phba->cfg_sg_seg_cnt < LPFC_DEFAULT_MENLO_SG_SEG_CNT)
++			phba->cfg_sg_seg_cnt = LPFC_DEFAULT_MENLO_SG_SEG_CNT;
++	}
++
+ 	if (!phba->sli.sli3_ring)
+ 		phba->sli.sli3_ring = kcalloc(LPFC_SLI3_MAX_RING,
+ 					      sizeof(struct lpfc_sli_ring),
+-- 
+2.27.0
+
diff --git a/SOURCES/0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch b/SOURCES/0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
new file mode 100644
index 0000000..219c160
--- /dev/null
+++ b/SOURCES/0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
@@ -0,0 +1,41 @@
+From c706b20bc89820ccc3c34e566d709f3f55c46624 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Tue, 9 Apr 2024 21:04:46 +0000
+Subject: [PATCH] Bring back deprecated pci ids to qla4xxx driver
+
+---
+ drivers/scsi/qla4xxx/ql4_os.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
+index b609f0c34..edf148fc7 100644
+--- a/drivers/scsi/qla4xxx/ql4_os.c
++++ b/drivers/scsi/qla4xxx/ql4_os.c
+@@ -9855,6 +9855,24 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
+ 		.subvendor	= PCI_ANY_ID,
+ 		.subdevice	= PCI_ANY_ID,
+ 	},
++	{
++		.vendor         = PCI_VENDOR_ID_QLOGIC,
++		.device         = PCI_DEVICE_ID_QLOGIC_ISP8022,
++		.subvendor      = PCI_ANY_ID,
++		.subdevice      = PCI_ANY_ID,
++	},
++	{
++		.vendor		= PCI_VENDOR_ID_QLOGIC,
++		.device		= PCI_DEVICE_ID_QLOGIC_ISP8324,
++		.subvendor	= PCI_ANY_ID,
++		.subdevice	= PCI_ANY_ID,
++	},
++	{
++		.vendor		= PCI_VENDOR_ID_QLOGIC,
++		.device		= PCI_DEVICE_ID_QLOGIC_ISP8042,
++		.subvendor	= PCI_ANY_ID,
++		.subdevice	= PCI_ANY_ID,
++	},
+ 	{0, 0},
+ };
+ MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
+-- 
+2.27.0
+
diff --git a/SOURCES/0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch b/SOURCES/0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
new file mode 100644
index 0000000..b3a1e15
--- /dev/null
+++ b/SOURCES/0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
@@ -0,0 +1,28 @@
+From 46c5a63208e3eb337da2ca8b1456a50707655e24 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Tue, 9 Apr 2024 21:07:06 +0000
+Subject: [PATCH] Bring back deprecated pci ids to be2iscsi driver
+
+---
+ drivers/scsi/be2iscsi/be_main.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
+index 885c351fb..2d04e67e7 100644
+--- a/drivers/scsi/be2iscsi/be_main.c
++++ b/drivers/scsi/be2iscsi/be_main.c
+@@ -375,6 +375,11 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
+ 
+ /*------------------- PCI Driver operations and data ----------------- */
+ static const struct pci_device_id beiscsi_pci_id_table[] = {
++	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },
++	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
++	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },
++	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },
++	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) },
+ 	{ PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) },
+ 	{ 0 }
+ };
+-- 
+2.27.0
+
diff --git a/SOURCES/debrand-rh-i686-cpu.patch b/SOURCES/debrand-rh-i686-cpu.patch
new file mode 100644
index 0000000..80d3b2e
--- /dev/null
+++ b/SOURCES/debrand-rh-i686-cpu.patch
@@ -0,0 +1,11 @@
+--- a/arch/x86/boot/main.c	2019-03-13 04:04:53.000000000 -0700
++++ b/arch/x86/boot/main.c	2019-05-25 14:31:21.043272496 -0700
+@@ -147,7 +147,7 @@ void main(void)
+ 
+ 	/* Make sure we have all the proper CPU support */
+ 	if (validate_cpu()) {
+-		puts("This processor is not supported in this version of RHEL.\n");
++		puts("This processor is not supported in this version of MSVSphere.\n");
+ 		die();
+ 	}
+ 
diff --git a/SOURCES/debrand-single-cpu.patch b/SOURCES/debrand-single-cpu.patch
new file mode 100644
index 0000000..c86d461
--- /dev/null
+++ b/SOURCES/debrand-single-cpu.patch
@@ -0,0 +1,11 @@
+--- a/arch/x86/kernel/setup.c	2019-03-13 04:04:53.000000000 -0700
++++ b/arch/x86/kernel/setup.c	2019-05-27 08:35:54.580595314 -0700
+@@ -900,7 +900,7 @@ static void rh_check_supported(void)
+ 	if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) &&
+ 	    !guest && is_kdump_kernel()) {
+ 		pr_crit("Detected single cpu native boot.\n");
+-		pr_crit("Important:  In Red Hat Enterprise Linux 8, single threaded, single CPU 64-bit physical systems are unsupported by Red Hat. Please contact your Red Hat support representative for a list of certified and supported systems.");
++		pr_crit("Important:  In MSVSphere 8, single threaded, single CPU 64-bit physical systems are unsupported. Please see https://www.almalinux.org for more information");
+ 	}
+ 
+ 	/*
diff --git a/SOURCES/kernel-rt-aarch64-debug.config b/SOURCES/kernel-rt-aarch64-debug.config
index 32c7106..2c78ff0 100644
--- a/SOURCES/kernel-rt-aarch64-debug.config
+++ b/SOURCES/kernel-rt-aarch64-debug.config
@@ -953,6 +953,7 @@
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_KS7010 is not set
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
 # CONFIG_KXCJK1013 is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_LANMEDIA is not set
@@ -2357,7 +2358,6 @@
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_WHCI_HCD is not set
 # CONFIG_USB_WUSB_CBAF_DEBUG is not set
@@ -2481,6 +2481,7 @@ CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DEBUGGER=y
 CONFIG_ACPI_DEBUGGER_USER=m
 CONFIG_ACPI_FAN=y
+CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HMAT=y
@@ -5349,7 +5350,6 @@ CONFIG_USB_EMI26=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_BENQ=m
diff --git a/SOURCES/kernel-rt-aarch64.config b/SOURCES/kernel-rt-aarch64.config
index c65bd1f..e984e10 100644
--- a/SOURCES/kernel-rt-aarch64.config
+++ b/SOURCES/kernel-rt-aarch64.config
@@ -1007,6 +1007,7 @@
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_KS7010 is not set
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
 # CONFIG_KXCJK1013 is not set
 # CONFIG_KXSD9 is not set
 # CONFIG_LANMEDIA is not set
@@ -2434,7 +2435,6 @@
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_WHCI_HCD is not set
 # CONFIG_USB_WUSB_CBAF_DEBUG is not set
@@ -2554,6 +2554,7 @@ CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_CPPC_CPUFREQ=y
 CONFIG_ACPI_FAN=y
+CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HMAT=y
@@ -5325,7 +5326,6 @@ CONFIG_USB_EMI26=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_BENQ=m
diff --git a/SOURCES/kernel-rt-ppc64le-debug.config b/SOURCES/kernel-rt-ppc64le-debug.config
index 7371b58..53000f2 100644
--- a/SOURCES/kernel-rt-ppc64le-debug.config
+++ b/SOURCES/kernel-rt-ppc64le-debug.config
@@ -861,6 +861,7 @@
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_KS7010 is not set
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
 # CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
 # CONFIG_KXCJK1013 is not set
 # CONFIG_KXSD9 is not set
@@ -2108,7 +2109,6 @@
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_USB_WHCI_HCD is not set
@@ -2227,6 +2227,7 @@ CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DEBUGGER=y
 CONFIG_ACPI_DEBUGGER_USER=m
+CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HMAT=y
@@ -5083,7 +5084,6 @@ CONFIG_USB_EMI26=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_BENQ=m
diff --git a/SOURCES/kernel-rt-ppc64le.config b/SOURCES/kernel-rt-ppc64le.config
index 70f18bd..9853653 100644
--- a/SOURCES/kernel-rt-ppc64le.config
+++ b/SOURCES/kernel-rt-ppc64le.config
@@ -917,6 +917,7 @@
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_KS7010 is not set
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
 # CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
 # CONFIG_KXCJK1013 is not set
 # CONFIG_KXSD9 is not set
@@ -2185,7 +2186,6 @@
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_USB_WHCI_HCD is not set
@@ -2299,6 +2299,7 @@ CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HMAT=y
@@ -5060,7 +5061,6 @@ CONFIG_USB_EMI26=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_BENQ=m
diff --git a/SOURCES/kernel-rt-s390x-debug.config b/SOURCES/kernel-rt-s390x-debug.config
index 6d2cafc..513bae8 100644
--- a/SOURCES/kernel-rt-s390x-debug.config
+++ b/SOURCES/kernel-rt-s390x-debug.config
@@ -917,6 +917,7 @@
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_KS7010 is not set
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
 # CONFIG_KVM_S390_UCONTROL is not set
 # CONFIG_KXCJK1013 is not set
 # CONFIG_KXSD9 is not set
@@ -2244,7 +2245,6 @@
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_USB_WHCI_HCD is not set
@@ -2367,6 +2367,7 @@ CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_DEBUG=y
 CONFIG_ACPI_DEBUGGER=y
 CONFIG_ACPI_DEBUGGER_USER=m
+CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HMAT=y
@@ -4984,7 +4985,6 @@ CONFIG_USB_EMI26=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_BENQ=m
diff --git a/SOURCES/kernel-rt-s390x-zfcpdump.config b/SOURCES/kernel-rt-s390x-zfcpdump.config
index 4a5a0a6..299f0d1 100644
--- a/SOURCES/kernel-rt-s390x-zfcpdump.config
+++ b/SOURCES/kernel-rt-s390x-zfcpdump.config
@@ -1059,6 +1059,7 @@
 # CONFIG_KSM is not set
 # CONFIG_KUNIT is not set
 # CONFIG_KUNIT_ALL_TESTS is not set
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
 # CONFIG_KVM is not set
 # CONFIG_KVM_S390_UCONTROL is not set
 # CONFIG_KXCJK1013 is not set
@@ -2491,7 +2492,6 @@
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_USB_WHCI_HCD is not set
@@ -2621,6 +2621,7 @@ CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HMAT=y
@@ -5008,7 +5009,6 @@ CONFIG_USB_EMI26=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_BENQ=m
diff --git a/SOURCES/kernel-rt-s390x.config b/SOURCES/kernel-rt-s390x.config
index b58d105..ae3ea3e 100644
--- a/SOURCES/kernel-rt-s390x.config
+++ b/SOURCES/kernel-rt-s390x.config
@@ -974,6 +974,7 @@
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_KS7010 is not set
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
 # CONFIG_KVM_S390_UCONTROL is not set
 # CONFIG_KXCJK1013 is not set
 # CONFIG_KXSD9 is not set
@@ -2322,7 +2323,6 @@
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_USB_WHCI_HCD is not set
@@ -2440,6 +2440,7 @@ CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HMAT=y
@@ -4960,7 +4961,6 @@ CONFIG_USB_EMI26=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_EZUSB_FX2=m
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_BENQ=m
diff --git a/SOURCES/kernel-rt-x86_64-debug.config b/SOURCES/kernel-rt-x86_64-debug.config
index 7bb6280..97d5728 100644
--- a/SOURCES/kernel-rt-x86_64-debug.config
+++ b/SOURCES/kernel-rt-x86_64-debug.config
@@ -311,6 +311,7 @@
 # CONFIG_CRYPTO_LZ4 is not set
 # CONFIG_CRYPTO_LZ4HC is not set
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MCRYPTD is not set
 # CONFIG_CRYPTO_MORUS1280 is not set
 # CONFIG_CRYPTO_MORUS1280_AVX2 is not set
 # CONFIG_CRYPTO_MORUS1280_SSE2 is not set
@@ -869,6 +870,7 @@
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_KS7010 is not set
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
 # CONFIG_KVM_DEBUG_FS is not set
 # CONFIG_KVM_DEVICE_ASSIGNMENT is not set
 # CONFIG_KVM_XEN is not set
@@ -1733,7 +1735,6 @@
 # CONFIG_SND_SOC_CS4271_I2C is not set
 # CONFIG_SND_SOC_CS4271_SPI is not set
 # CONFIG_SND_SOC_CS42L42 is not set
-# CONFIG_SND_SOC_CS42L42_SDW is not set
 # CONFIG_SND_SOC_CS42L51_I2C is not set
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
@@ -1760,7 +1761,6 @@
 # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set
 # CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set
 # CONFIG_SND_SOC_MAX9759 is not set
-# CONFIG_SND_SOC_MAX98363 is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
@@ -1781,7 +1781,6 @@
 # CONFIG_SND_SOC_PEB2466 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
-# CONFIG_SND_SOC_RT712_SDCA_DMIC_SDW is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 # CONFIG_SND_SOC_SMA1303 is not set
@@ -2115,7 +2114,6 @@
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_USB_WHCI_HCD is not set
@@ -2262,6 +2260,7 @@ CONFIG_ACPI_DPTF=y
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_EXTLOG=m
 CONFIG_ACPI_FAN=y
+CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HMAT=y
@@ -2748,7 +2747,6 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MCRYPTD=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_PCBC=m
@@ -2766,14 +2764,11 @@ CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_MB=m
 CONFIG_CRYPTO_SHA1_SSSE3=y
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA256_MB=m
 CONFIG_CRYPTO_SHA256_SSSE3=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA512_MB=m
 CONFIG_CRYPTO_SHA512_SSSE3=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
@@ -5234,6 +5229,7 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
 CONFIG_SND_SOC_AMD_YC_MACH=m
 CONFIG_SND_SOC_CS35L41_I2C=m
 CONFIG_SND_SOC_CS35L41_SPI=m
+CONFIG_SND_SOC_CS42L42_SDW=m
 CONFIG_SND_SOC_ES8326=m
 CONFIG_SND_SOC_INTEL_AVS=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -5281,12 +5277,14 @@ CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
 CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_MAX98363=m
 CONFIG_SND_SOC_NAU8315=m
 CONFIG_SND_SOC_NAU8821=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT700_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT712_SDCA_DMIC_SDW=m
 CONFIG_SND_SOC_RT712_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 CONFIG_SND_SOC_SOF=m
@@ -5563,7 +5561,6 @@ CONFIG_USB_EMI62=m
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_FEW_INIT_RETRIES=y
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_BENQ=m
diff --git a/SOURCES/kernel-rt-x86_64.config b/SOURCES/kernel-rt-x86_64.config
index 7f40cb1..19d3bf8 100644
--- a/SOURCES/kernel-rt-x86_64.config
+++ b/SOURCES/kernel-rt-x86_64.config
@@ -327,6 +327,7 @@
 # CONFIG_CRYPTO_LZ4 is not set
 # CONFIG_CRYPTO_LZ4HC is not set
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MCRYPTD is not set
 # CONFIG_CRYPTO_MORUS1280 is not set
 # CONFIG_CRYPTO_MORUS1280_AVX2 is not set
 # CONFIG_CRYPTO_MORUS1280_SSE2 is not set
@@ -924,6 +925,7 @@
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_KS7010 is not set
+# CONFIG_KUNIT_DEFAULT_ENABLED is not set
 # CONFIG_KVM_DEBUG_FS is not set
 # CONFIG_KVM_DEVICE_ASSIGNMENT is not set
 # CONFIG_KVM_XEN is not set
@@ -1806,7 +1808,6 @@
 # CONFIG_SND_SOC_CS4271_I2C is not set
 # CONFIG_SND_SOC_CS4271_SPI is not set
 # CONFIG_SND_SOC_CS42L42 is not set
-# CONFIG_SND_SOC_CS42L42_SDW is not set
 # CONFIG_SND_SOC_CS42L51_I2C is not set
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
@@ -1833,7 +1834,6 @@
 # CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927 is not set
 # CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE is not set
 # CONFIG_SND_SOC_MAX9759 is not set
-# CONFIG_SND_SOC_MAX98363 is not set
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
@@ -1854,7 +1854,6 @@
 # CONFIG_SND_SOC_PEB2466 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
-# CONFIG_SND_SOC_RT712_SDCA_DMIC_SDW is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 # CONFIG_SND_SOC_SMA1303 is not set
@@ -2189,7 +2188,6 @@
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_U132_HCD is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_USB_WHCI_HCD is not set
@@ -2334,6 +2332,7 @@ CONFIG_ACPI_DPTF=y
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_EXTLOG=m
 CONFIG_ACPI_FAN=y
+CONFIG_ACPI_FFH=y
 CONFIG_ACPI_FPDT=y
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_HMAT=y
@@ -2809,7 +2808,6 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MCRYPTD=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_PCBC=m
@@ -2827,14 +2825,11 @@ CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_MB=m
 CONFIG_CRYPTO_SHA1_SSSE3=y
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA256_MB=m
 CONFIG_CRYPTO_SHA256_SSSE3=y
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA512_MB=m
 CONFIG_CRYPTO_SHA512_SSSE3=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
@@ -5214,6 +5209,7 @@ CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
 CONFIG_SND_SOC_AMD_YC_MACH=m
 CONFIG_SND_SOC_CS35L41_I2C=m
 CONFIG_SND_SOC_CS35L41_SPI=m
+CONFIG_SND_SOC_CS42L42_SDW=m
 CONFIG_SND_SOC_ES8326=m
 CONFIG_SND_SOC_INTEL_AVS=m
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
@@ -5261,12 +5257,14 @@ CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
 CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_MAX98363=m
 CONFIG_SND_SOC_NAU8315=m
 CONFIG_SND_SOC_NAU8821=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_RT1308_SDW=m
 CONFIG_SND_SOC_RT700_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT712_SDCA_DMIC_SDW=m
 CONFIG_SND_SOC_RT712_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 CONFIG_SND_SOC_SOF=m
@@ -5536,7 +5534,6 @@ CONFIG_USB_EMI62=m
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_FEW_INIT_RETRIES=y
-CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_GL860=m
 CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_BENQ=m
diff --git a/SOURCES/mod-internal.list b/SOURCES/mod-internal.list
index 6fbd37d..ba36786 100644
--- a/SOURCES/mod-internal.list
+++ b/SOURCES/mod-internal.list
@@ -13,6 +13,7 @@ qos-test
 resource_kunit
 soc-topology-test
 soc-utils-test
+stackinit_kunit
 string-stream-test
 test_linear_ranges
 test_bits
diff --git a/SOURCES/x509.genkey b/SOURCES/x509.genkey
index b1bbe38..b1d1678 100644
--- a/SOURCES/x509.genkey
+++ b/SOURCES/x509.genkey
@@ -5,9 +5,9 @@ prompt = no
 x509_extensions = myexts
 
 [ req_distinguished_name ]
-O = Red Hat
-CN = Red Hat Enterprise Linux kernel signing key
-emailAddress = secalert@redhat.com
+O = NCSD LLC
+CN = MSVSphere kernel signing key
+emailAddress = security@msvsphere.ru
 
 [ myexts ]
 basicConstraints=critical,CA:FALSE
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 2b90996..c6c00be 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -12,7 +12,7 @@
 # change below to w4T.xzdio):
 %define _binary_payload w3T.xzdio
 
-%global distro_build 513
+%global distro_build 544
 
 # Sign the x86_64 kernel for secure boot authentication
 %ifarch x86_64 aarch64 s390x ppc64le
@@ -38,10 +38,10 @@
 # define buildid .local
 
 %define specversion 4.18.0
-%define pkgrelease 513.24.1.rt7.326.el8_9
+%define pkgrelease 544.rt7.333.el8
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 513.24.1.rt7.326%{?dist}
+%define specrelease 544.rt7.333%{?dist}
 
 %define pkg_release %{specrelease}%{?buildid}
 
@@ -53,8 +53,6 @@
 # architecture allows it. All should default to 1 (enabled) and be flipped to
 # 0 (disabled) by later arch-specific checks.
 
-%define _with_kabidupchk 1
-%define _with_kabidupchk 1
 # The following build options are enabled by default.
 # Use either --without <opt> in your rpmbuild command or force values
 # to 0 in here to disable them.
@@ -149,7 +147,7 @@
 # The preempt RT patch level
 %global rttag .rt7
 # realtimeN
-%global rtbuild .326
+%global rtbuild .333
 %define with_doc 0
 %define with_headers 0
 %define with_cross_headers 0
@@ -416,6 +414,7 @@ BuildRequires: kabi-dw
 %if %{signkernel}%{signmodules}
 BuildRequires: openssl openssl-devel
 %if %{signkernel}
+BuildRequires: system-sb-certs
 %ifarch x86_64 aarch64
 BuildRequires: nss-tools
 BuildRequires: pesign >= 0.10-4
@@ -448,37 +447,9 @@ Source9: x509.genkey
 %define signing_key_filename kernel-signing-s390.cer
 %endif
 
-Source10: redhatsecurebootca3.cer
-Source11: centossecurebootca2.cer
-Source12: centossecureboot201.cer
-Source13: redhatsecureboot501.cer
-Source14: redhatsecureboot302.cer
-Source15: redhatsecureboot303.cer
-Source16: redhatsecurebootca7.cer
-%if 0%{?centos}
-%define secureboot_ca_0  %{SOURCE11}
-%define secureboot_key_0 %{SOURCE12}
-%define pesign_name_0 centossecureboot201
-%else
-
-%ifarch x86_64 aarch64
-%define secureboot_ca_0 %{SOURCE10}
-%define secureboot_key_0 %{SOURCE13}
-%define pesign_name_0 redhatsecureboot501
-%endif
-
-%ifarch s390x
-%define secureboot_ca_0 %{SOURCE10}
-%define secureboot_key_0 %{SOURCE14}
-%define pesign_name_0 redhatsecureboot302
-%endif
-
-%ifarch ppc64le
-%define secureboot_ca_0 %{SOURCE16}
-%define secureboot_key_0 %{SOURCE15}
-%define pesign_name_0 redhatsecureboot701
-%endif
-%endif
+%define secureboot_ca_0  %{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer
+%define secureboot_key_0 %{_datadir}/pki/sb-certs/secureboot-grub2-%{_arch}.cer
+%define pesign_name_0 spheresecureboot001
 
 Source17: mod-blacklist.sh
 Source18: mod-sign.sh
@@ -507,8 +478,8 @@ Source43: generate_bls_conf.sh
 
 Source44: mod-internal.list
 
-Source100: rheldup3.x509
-Source101: rhelkpatch1.x509
+Source100: msvspheredup1.x509
+Source101: msvspherepatch1.x509
 
 %if %{with_kabichk}
 Source200: check-kabi
@@ -546,13 +517,26 @@ Source4001: rpminspect.yaml
 # empty final patch to facilitate testing of kernel patches
 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-Enable-all-disabled-pci-devices-by-moving-to-unmaint.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-hpsa-driver.patch
+Patch2005: 0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
+Patch2006: 0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
+Patch2007: 0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
+Patch2008: 0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/%{name}-%{KVERREL}-root
 
 %description
-This is the package which provides the Linux %{name} for Red Hat Enterprise
-Linux. It is based on upstream Linux at version %{version} and maintains kABI
+This is the package which provides the Linux %{name} for MSVSphere.
+It is based on upstream Linux at version %{version} and maintains kABI
 compatibility of a set of approved symbols, however it is heavily modified with
 backports and fixes pulled from newer upstream Linux %{name} releases. This means
 this is not a %{version} kernel anymore: it includes several components which come
@@ -560,7 +544,7 @@ from newer upstream linux versions, while maintaining a well tested and stable
 core. Some of the components/backports that may be pulled in are: changes like
 updates to the core kernel (eg.: scheduler, cgroups, memory management, security
 fixes and features), updates to block layer, supported filesystems, major driver
-updates for supported hardware in Red Hat Enterprise Linux, enhancements for
+updates for supported hardware in MSVSphere, enhancements for
 enterprise customers, etc.
 
 #
@@ -809,14 +793,14 @@ kernel-gcov includes the gcov graph and source files for gcov coverage collectio
 %endif
 
 %package -n %{name}-abi-stablelists
-Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists
+Summary: The MSVSphere kernel ABI symbol stablelists
 Group: System Environment/Kernel
 AutoReqProv: no
 Obsoletes: %{name}-abi-whitelists < %{specversion}-%{pkg_release}
 Provides: %{name}-abi-whitelists
 %description -n %{name}-abi-stablelists
-The kABI package contains information pertaining to the Red Hat Enterprise
-Linux kernel ABI, including lists of kernel symbols that are needed by
+The kABI package contains information pertaining to the MSVSphere
+kernel ABI, including lists of kernel symbols that are needed by
 external Linux kernel modules, and a yum plugin to aid enforcement.
 
 %if %{with_kabidw_base}
@@ -825,8 +809,8 @@ Summary: The baseline dataset for kABI verification using DWARF data
 Group: System Environment/Kernel
 AutoReqProv: no
 %description kernel-kabidw-base-internal
-The package contains data describing the current ABI of the Red Hat Enterprise
-Linux kernel, suitable for the kabi-dw tool.
+The package contains data describing the current ABI of the MSVSphere
+kernel, suitable for the kabi-dw tool.
 %endif
 
 #
@@ -900,7 +884,7 @@ Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 AutoReq: no\
 AutoProv: yes\
 %description %{?1:%{1}-}modules-internal\
-This package provides kernel modules for the %{?2:%{2} }kernel package for Red Hat internal usage.\
+This package provides kernel modules for the %{?2:%{2} }kernel package for MSVSphere usage.\
 %{nil}
 
 #
@@ -1102,6 +1086,18 @@ mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 
+ApplyOptionalPatch debrand-single-cpu.patch
+ApplyOptionalPatch debrand-rh-i686-cpu.patch
+
+ApplyPatch 0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch
+ApplyPatch 0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
+ApplyPatch 0003-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
+ApplyPatch 0004-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
+ApplyPatch 0005-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
+ApplyPatch 0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
+ApplyPatch 0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
+ApplyPatch 0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
+
 ApplyOptionalPatch linux-kernel-test.patch
 
 # END OF PATCH APPLICATIONS
@@ -1752,7 +1748,7 @@ BuildKernel() {
     # build a BLS config for this kernel
     %{SOURCE43} "$KernelVer" "$RPM_BUILD_ROOT" "%{?variant}"
 
-    # Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel
+    # MSVSphere UEFI Secure Boot CA cert, which can be used to authenticate the kernel
     mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer
     install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer
     %ifarch s390x ppc64le
@@ -2700,6 +2696,54 @@ fi
 #
 #
 %changelog
+* Mon Apr 15 2024 Arkady L. Shane <tigro@msvsphere-os.ru> [4.18.0-544.rt7.333.el8]
+- Modified to use MSVSphere Secure Boot certificates
+- Bring back deprecated pci ids to lpfc, qla4xxx, be2iscsi drivers
+- Update and reenable pci related patches
+
+* Fri Feb 23 2024 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-544.rt7.333.el8]
+- [rt] build kernel-rt-4.18.0-544.rt7.333.el8 [RHEL-5332]
+- ext4: fix kernel BUG in 'ext4_write_inline_data_end()' (Carlos Maiolino) [RHEL-23386] {CVE-2021-33631}
+- i2c: designware: Disable TX_EMPTY irq while waiting for block length byte (Charles Mirabile) [RHEL-24019]
+- scsi: smartpqi: Fix disable_managed_interrupts (Tomas Henzl) [RHEL-25747]
+- hwmon: (k10temp) Check range scale when CUR_TEMP register is read-write (Steve Best) [RHEL-26167]
+- gitlab-ci: do not show (results can be ignored) for rt pipelines (Michael Hofmann)
+
+* Wed Feb 21 2024 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-543.rt7.332.el8]
+- [rt] build kernel-rt-4.18.0-543.rt7.332.el8 [RHEL-5332]
+- perf symbols: Symbol lookup with kcore can fail if multiple segments match stext (Charles Mirabile) [RHEL-23760]
+- perf/arm-cmn: Move overlapping wp_combine field (Charles Mirabile) [RHEL-23757]
+- drm/amd: Fix detection of _PR3 on the PCIe root port (Michel Dänzer) [RHEL-14572]
+- xfs: avoid AGI->AGF->inode-buffer deadlocks (Thiago Becker) [RHEL-7914]
+- dm-crypt, dm-verity: disable tasklets (Benjamin Marzinski) [RHEL-22232]
+- dm verity: initialize fec io before freeing it (Benjamin Marzinski) [RHEL-22232]
+- dm-verity: don't use blocking calls from tasklets (Benjamin Marzinski) [RHEL-22232]
+- char: misc: Increase the maximum number of dynamic misc devices to 1048448 (Charles Mirabile) [RHEL-23758]
+- char: misc: remove usage of list iterator past the loop body (Charles Mirabile) [RHEL-23758]
+- char: misc: increase DYNAMIC_MINORS value (Charles Mirabile) [RHEL-23758]
+- char: misc: Move EXPORT_SYMBOL immediately next to the functions/varibles (Charles Mirabile) [RHEL-23758]
+- clocksource/drivers/arm_arch_timer: Force inlining of erratum_set_next_event_generic() (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Fix handling of ARM erratum 858921 (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Remove arch_timer_rate1 (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Disable timer before programming CVAL (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Fix XGene-1 TVAL register math error (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: limit XGene-1 workaround (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arch_arm_timer: Move workaround synchronisation around (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Fix masking for high freq counters (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Drop unnecessary ISB on CVAL programming (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Remove any trace of the TVAL programming interface (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Work around broken CVAL implementations (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Advertise 56bit timer to the core code (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Move MMIO timer programming over to CVAL (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Fix MMIO base address vs callback ordering issue (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Add __ro_after_init and __init (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Move drop _tval from erratum function names (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Move system register timer programming over to CVAL (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Extend write side of timer register accessors to u64 (Mark Salter) [RHEL-19605]
+- clocksource/drivers/arm_arch_timer: Drop CNT*_TVAL read accessors (Mark Salter) [RHEL-19605]
+- clocksource/arm_arch_timer: Add build-time guards for unhandled register accesses (Mark Salter) [RHEL-19605]
+
 * Tue Mar 19 2024 Lucas Zampieri <lzampier@redhat.com> [4.18.0-513.24.1.rt7.326.el8_9]
 - [rt] build kernel-rt-4.18.0-513.24.1.rt7.326.el8_9 [RHEL-23853]
 - ceph: add ceph_cap_unlink_work to fire check_caps() immediately (Xiubo Li) [RHEL-27496 RHEL-21760]