Revert "Fix RHEL-36117 and bump release to 553.el8_10"
This reverts commit 2667ba38a3
.
This commit is contained in:
parent
a001cea3fe
commit
5e25fe158e
@ -1,26 +0,0 @@
|
|||||||
diff -Naur linux-4.18.0-552.3.1.el8_10/include/linux/cpuhotplug.h linux-4.18.0-553.4.1.el8_10/include/linux/cpuhotplug.h
|
|
||||||
--- linux-4.18.0-552.3.1.el8_10/include/linux/cpuhotplug.h 2024-05-11 16:20:25
|
|
||||||
+++ linux-4.18.0-553.4.1.el8_10/include/linux/cpuhotplug.h 2024-05-15 17:42:15
|
|
||||||
@@ -151,7 +151,9 @@
|
|
||||||
* the other CPUHP states are not changed or broken.
|
|
||||||
*/
|
|
||||||
RH_KABI_BROKEN_INSERT_ENUM(CPUHP_AP_SCHED_WAIT_EMPTY)
|
|
||||||
+#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
|
|
||||||
RH_KABI_BROKEN_INSERT_ENUM(CPUHP_AP_HYPERV_ONLINE)
|
|
||||||
+#endif
|
|
||||||
CPUHP_AP_SMPBOOT_THREADS,
|
|
||||||
RH_KABI_BROKEN_REMOVE_ENUM(CPUHP_AP_X86_VDSO_VMA_ONLINE)
|
|
||||||
CPUHP_AP_IRQ_AFFINITY_ONLINE,
|
|
||||||
@@ -165,7 +167,12 @@
|
|
||||||
CPUHP_AP_PERF_X86_CQM_ONLINE,
|
|
||||||
CPUHP_AP_PERF_X86_CSTATE_ONLINE,
|
|
||||||
/* kABI: CPUHP_AP_PERF_X86_IDXD_ONLINE, */
|
|
||||||
+#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
|
|
||||||
+ /* Compensate for the addition of CPUHP_AP_HYPERV_ONLINE */
|
|
||||||
+ RH_KABI_BROKEN_REMOVE_ENUM(CPUHP_AP_PERF_S390_CF_ONLINE)
|
|
||||||
+#else
|
|
||||||
CPUHP_AP_PERF_S390_CF_ONLINE,
|
|
||||||
+#endif
|
|
||||||
/* kABI: CPUHP_AP_PERF_S390_CFD_ONLINE, */
|
|
||||||
CPUHP_AP_PERF_S390_SF_ONLINE,
|
|
||||||
CPUHP_AP_PERF_ARM_CCI_ONLINE,
|
|
@ -38,11 +38,10 @@
|
|||||||
# define buildid .local
|
# define buildid .local
|
||||||
|
|
||||||
%define specversion 4.18.0
|
%define specversion 4.18.0
|
||||||
%define pkgrelease 553.el8_10
|
%define pkgrelease 552.el8
|
||||||
|
|
||||||
# allow pkg_release to have configurable %%{?dist} tag
|
# allow pkg_release to have configurable %%{?dist} tag
|
||||||
%define specrelease 553%{?dist}
|
%define specrelease 552%{?dist}
|
||||||
%define tarfile_release 552.el8
|
|
||||||
|
|
||||||
%define pkg_release %{specrelease}%{?buildid}
|
%define pkg_release %{specrelease}%{?buildid}
|
||||||
|
|
||||||
@ -434,7 +433,7 @@ BuildRequires: xmlto
|
|||||||
BuildRequires: asciidoc
|
BuildRequires: asciidoc
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Source0: linux-%{specversion}-%{tarfile_release}.tar.xz
|
Source0: linux-%{specversion}-%{pkgrelease}.tar.xz
|
||||||
|
|
||||||
Source9: x509.genkey
|
Source9: x509.genkey
|
||||||
|
|
||||||
@ -537,9 +536,6 @@ Patch2006: 0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
|
|||||||
Patch2007: 0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
|
Patch2007: 0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
|
||||||
Patch2008: 0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
|
Patch2008: 0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
|
||||||
|
|
||||||
# RHEL-36117 patch that makes difference between 4.18.0-552.el8 and 4.18.0-553.el8_10
|
|
||||||
Patch2009: RHEL-36117.patch
|
|
||||||
|
|
||||||
# END OF PATCH DEFINITIONS
|
# END OF PATCH DEFINITIONS
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{KVERREL}-root
|
BuildRoot: %{_tmppath}/%{name}-%{KVERREL}-root
|
||||||
@ -1097,9 +1093,9 @@ ApplyOptionalPatch()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%setup -q -n %{name}-%{specversion}-%{tarfile_release} -c
|
%setup -q -n %{name}-%{specversion}-%{pkgrelease} -c
|
||||||
cp -v %{SOURCE9000} linux-%{specversion}-%{tarfile_release}/certs/rhel.pem
|
cp -v %{SOURCE9000} linux-%{specversion}-%{pkgrelease}/certs/rhel.pem
|
||||||
mv linux-%{specversion}-%{tarfile_release} linux-%{KVERREL}
|
mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL}
|
||||||
|
|
||||||
cd linux-%{KVERREL}
|
cd linux-%{KVERREL}
|
||||||
|
|
||||||
@ -1115,8 +1111,6 @@ ApplyPatch 0006-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
|
|||||||
ApplyPatch 0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
|
ApplyPatch 0007-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
|
||||||
ApplyPatch 0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
|
ApplyPatch 0008-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
|
||||||
|
|
||||||
ApplyPatch RHEL-36117.patch
|
|
||||||
|
|
||||||
ApplyOptionalPatch linux-kernel-test.patch
|
ApplyOptionalPatch linux-kernel-test.patch
|
||||||
|
|
||||||
# END OF PATCH APPLICATIONS
|
# END OF PATCH APPLICATIONS
|
||||||
@ -2713,9 +2707,6 @@ fi
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
* Wed May 22 2024 Andrew Lukoshko <alukoshko@almalinux.org> [4.18.0-553.el8_10]
|
|
||||||
- cpuhotplug: Fix kABI breakage caused by CPUHP_AP_HYPERV_ONLINE (Vitaly Kuznetsov) [RHEL-36117]
|
|
||||||
|
|
||||||
* Sun Apr 07 2024 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-552.el8]
|
* Sun Apr 07 2024 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-552.el8]
|
||||||
- i40e: Enforce software interrupt during busy-poll exit (Ivan Vecera) [RHEL-26248]
|
- i40e: Enforce software interrupt during busy-poll exit (Ivan Vecera) [RHEL-26248]
|
||||||
- i40e: Remove _t suffix from enum type names (Ivan Vecera) [RHEL-26248]
|
- i40e: Remove _t suffix from enum type names (Ivan Vecera) [RHEL-26248]
|
||||||
|
Loading…
Reference in New Issue
Block a user