hpsa: bring back deprecated PCI ids #CFHack #CFHack2024

mptsas: bring back deprecated PCI ids #CFHack #CFHack2024

megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024

qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024

qla4xxx: bring back deprecated PCI ids

lpfc: bring back deprecated PCI ids

be2iscsi: bring back deprecated PCI ids

kernel/rh_messages.h: enable all disabled pci devices by moving to unmaintained

Use AlmaLinux OS secure boot cert

Debrand for AlmaLinux OS

.gitignore

@@ -1,6 +1,6 @@
 SOURCES/centossecureboot201.cer
 SOURCES/centossecurebootca2.cer
-SOURCES/linux-4.18.0-553.36.1.rt7.377.el8_10.tar.xz
+SOURCES/linux-4.18.0-553.37.1.rt7.378.el8_10.tar.xz
 SOURCES/redhatsecureboot302.cer
 SOURCES/redhatsecureboot303.cer
 SOURCES/redhatsecureboot501.cer

.kernel-rt.metadata

@@ -1,6 +1,6 @@
 2ba40bf9138b48311e5aa1b737b7f0a8ad66066f SOURCES/centossecureboot201.cer
 bfdb3d7cffc43f579655af5155d50c08671d95e5 SOURCES/centossecurebootca2.cer
-2b8f854895f111db68384b0caf56c5d775635021 SOURCES/linux-4.18.0-553.36.1.rt7.377.el8_10.tar.xz
+71f25db86bcd8f8b3f818883073885afece29aaf SOURCES/linux-4.18.0-553.37.1.rt7.378.el8_10.tar.xz
 13e5cd3f856b472fde80a4deb75f4c18dfb5b255 SOURCES/redhatsecureboot302.cer
 e89890ca0ded2f9058651cc5fa838b78db2e6cc2 SOURCES/redhatsecureboot303.cer
 ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer

SPECS/kernel.spec

@@ -38,10 +38,10 @@
 # define buildid .local
 
 %define specversion 4.18.0
-%define pkgrelease 553.36.1.rt7.377.el8_10
+%define pkgrelease 553.37.1.rt7.378.el8_10
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 553.36.1.rt7.377%{?dist}
+%define specrelease 553.37.1.rt7.378%{?dist}
 
 %define pkg_release %{specrelease}%{?buildid}
 
@@ -148,7 +148,7 @@
 # The preempt RT patch level
 %global rttag .rt7
 # realtimeN
-%global rtbuild .377
+%global rtbuild .378
 %define with_doc 0
 %define with_headers 0
 %define with_cross_headers 0
@@ -347,6 +347,7 @@ Requires: rt-setup
 %endif
 %endif
 
+
 #
 # List the packages used during the kernel build
 #
@@ -446,8 +447,6 @@ Source9: x509.genkey
 %define signing_key_filename kernel-signing-s390.cer
 %endif
 
-Source10: almalinuxsecurebootca0.cer
-Source11: almalinuxsecurebootca0.cer
 
 %define secureboot_ca_0 %{SOURCE10}
 %define secureboot_ca_1 %{SOURCE11}
@@ -459,6 +458,8 @@ Source11: almalinuxsecurebootca0.cer
 %ifarch x86_64 aarch64
 %define secureboot_key_1 %{SOURCE11}
 %define pesign_name_1 almalinuxsecurebootca0
+
+
 %endif
 
 Source17: mod-blacklist.sh
@@ -488,8 +489,6 @@ Source43: generate_bls_conf.sh
 
 Source44: mod-internal.list
 
-Source100: almalinuxdup1.x509
-Source101: almalinuxkpatch1.x509
 
 %if %{with_kabichk}
 Source200: check-kabi
@@ -522,12 +521,18 @@ Source4000: gating.yaml
 # rpminspect config
 Source4001: rpminspect.yaml
 
+# AlmaLinux Source
+Source10: almalinuxsecurebootca0.cer
+Source11: almalinuxsecurebootca0.cer
+Source100: almalinuxdup1.x509
+Source101: almalinuxkpatch1.x509
+
 ## Patches needed for building this package
 
 # empty final patch to facilitate testing of kernel patches
 Patch999999: linux-kernel-test.patch
 
-# Bring back deprecated PCI ids #CFHack #CFHack2024
+# AlmaLinux Patch
 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
@@ -984,8 +989,8 @@ Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 Provides: installonlypkg(kernel)\
 %if "%{?1}" == ""\
 Provides: almalinux(kernel-sig-key) = 202303\
-Conflicts: shim-ia32 <= 15.6-1.el8.alma\
+Conflicts: shim-ia32 < 15.8-4.el8_9.alma.2\
-Conflicts: shim-x64 <= 15.6-1.el8.alma\
+Conflicts: shim-x64 < 15.8-4.el8_9.alma.2\
 %endif\
 %{expand:%%kernel_reqprovconf}\
 %if %{?1:1} %{!?1:0} \
@@ -1098,6 +1103,9 @@ mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 
+ApplyOptionalPatch linux-kernel-test.patch
+
+# Applying AlmaLinux 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
@@ -1107,8 +1115,6 @@ 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
 
 # Any further pre-build tree manipulations happen here.
@@ -2705,6 +2711,29 @@ fi
 #
 #
 %changelog
+* Thu Feb 06 2025 Andrei Lukoshko <alukoshko@almalinux.org> - 4.18.0-553.37.1.rt7.378
+- hpsa: bring back deprecated PCI ids #CFHack #CFHack2024
+- mptsas: bring back deprecated PCI ids #CFHack #CFHack2024
+- megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024
+- qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024
+- qla4xxx: bring back deprecated PCI ids
+- lpfc: bring back deprecated PCI ids
+- be2iscsi: bring back deprecated PCI ids
+- kernel/rh_messages.h: enable all disabled pci devices by moving to
+  unmaintained
+
+* Thu Feb 06 2025 Eduard Abdullin <eabdullin@almalinux.org> - 4.18.0-553.37.1.rt7.378
+- Use AlmaLinux OS secure boot cert
+- Debrand for AlmaLinux OS
+
+* Fri Jan 17 2025 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-553.37.1.rt7.378.el8_10]
+- [rt] build kernel-rt-4.18.0-553.37.1.rt7.378.el8_10 [RHEL-74366]
+- arm64/sve: Discard stale CPU state when handling SVE traps (Mark Salter) [RHEL-71535] {CVE-2024-50275}
+- scsi: core: Handle devices which return an unusually large VPD page count (Ewan D. Milne) [RHEL-34275]
+- scsi: core: Fix unremoved procfs host directory regression (Ewan D. Milne) [RHEL-34275]
+- scsi: core: Consult supported VPD page list prior to fetching page (Ewan D. Milne) [RHEL-34275]
+- NFSv4: Fix dropped lock for racing OPEN and delegation return (Benjamin Coddington) [RHEL-73889]
+
 * Thu Jan 09 2025 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-553.36.1.rt7.377.el8_10]
 - [rt] build kernel-rt-4.18.0-553.36.1.rt7.377.el8_10 [RHEL-73392]
 - cpufreq: intel_pstate: Support Emerald Rapids OOB mode (David Arcari) [RHEL-59649]
@@ -4271,16 +4300,6 @@ fi
 - NFSv4.1: use EXCHGID4_FLAG_USE_PNFS_DS for DS server (Scott Mayhew) [RHEL-7994]
 - x86/boot: Ignore NMIs during very early boot (Valentin Schneider) [RHEL-22749]
 
-* Fri Feb 23 2024 Andrew Lukoshko <alukoshko@almalinux.org> [4.18.0-544.rt7.333.el8]
-- hpsa: bring back deprecated PCI ids #CFHack #CFHack2024
-- mptsas: bring back deprecated PCI ids #CFHack #CFHack2024
-- megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024
-- qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024
-- qla4xxx: bring back deprecated PCI ids
-- lpfc: bring back deprecated PCI ids
-- be2iscsi: bring back deprecated PCI ids
-- kernel/rh_messages.h: enable all disabled pci devices by moving to unmaintained
-
 * 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}