autopatch/kernel
4
0
Fork 1
Code Issues Pull Requests Releases Activity

update patches for 10.0

Browse Source
This commit is contained in:
eabdullin 2025-11-12 11:20:02 +03:00
parent b1c35ae94f
commit 0fe6e462dd
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
files/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
View File

@ -1,4 +1,4 @@
From 18a57b9cd3833462356c3b4df180840f3fede7c6 Mon Sep 17 00:00:00 2001 From fd5f73352eeb95406b6da1d7d42a3ebce13c2a5b Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org> From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Thu, 8 Aug 2024 16:41:35 +0000 Date: Thu, 8 Aug 2024 16:41:35 +0000
Subject: [PATCH 04/10] Bring back deprecated pci ids to qla2xxx driver Subject: [PATCH 04/10] Bring back deprecated pci ids to qla2xxx driver
@ -8,19 +8,19 @@ Subject: [PATCH 04/10] Bring back deprecated pci ids to qla2xxx driver
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 26089872a..8018c68f2 100644 index 57beb0953..0b7c64376 100644
--- a/drivers/scsi/qla2xxx/qla_os.c --- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -8123,7 +8123,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { @@ -8117,7 +8117,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
}; };
static const struct pci_device_id qla2xxx_pci_tbl[] = { static struct pci_device_id qla2xxx_pci_tbl[] = {
-#ifndef CONFIG_RHEL_DIFFERENCES -#ifndef CONFIG_RHEL_DIFFERENCES
+#ifndef CONFIG_ALMALINUX_DIFFERENCES +#ifndef CONFIG_ALMALINUX_DIFFERENCES
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { 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_ISP2200) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },
@@ -8139,12 +8139,12 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -8133,12 +8133,12 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {
#endif #endif
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) }, { 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_ISP2031) },
@ -36,5 +36,4 @@ index 26089872a..8018c68f2 100644
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) },
#endif #endif
-- --
2.43.5 2.51.0

7
files/0008-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
View File

@ -8,12 +8,12 @@ Subject: [PATCH 08/10] Bring back deprecated pci ids to megaraid_sas driver
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index bf57fd3b9..0eaed98ac 100644 index 908663661..7fef094e2 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c --- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -149,7 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance); @@ -149,7 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance);
*/ */
static const struct pci_device_id megasas_pci_table[] = { static struct pci_device_id megasas_pci_table[] = {
-#ifndef CONFIG_RHEL_DIFFERENCES -#ifndef CONFIG_RHEL_DIFFERENCES
+#ifndef CONFIG_ALMALINUX_DIFFERENCES +#ifndef CONFIG_ALMALINUX_DIFFERENCES
@ -30,5 +30,4 @@ index bf57fd3b9..0eaed98ac 100644
/* xscale IOP, vega */ /* xscale IOP, vega */
{PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)}, {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
-- --
2.43.5 2.51.0