rpms
/
kernel-rt
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'alma-origin/c9' into HEAD

This commit is contained in:
Stepan Oksanichenko 2023-04-11 13:50:23 +00:00
parent 3d1936ee55 2ce99d17c6
commit 5b06569be6
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
SOURCES/linux-5.14.0-162.22.2.rt21.186.el9_1.tar.xz SOURCES/linux-5.14.0-162.23.1.rt21.186.el9_1.tar.xz
SOURCES/rheldup3.x509 SOURCES/rheldup3.x509
SOURCES/rhelkpatch1.x509 SOURCES/rhelkpatch1.x509

2
.kernel-rt.metadata
View File

@ -1,3 +1,3 @@
cefcf0e1bb1c83e6ff20e0783875aa0e6adba16b SOURCES/linux-5.14.0-162.22.2.rt21.186.el9_1.tar.xz 12056348e5be58eee9c5e30bf116e723aa3eec8a SOURCES/linux-5.14.0-162.23.1.rt21.186.el9_1.tar.xz
95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509 95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509 d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509

2
SOURCES/Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 1
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 162.22.2 RHEL_RELEASE = 162.23.1
# #
# ZSTREAM # ZSTREAM

23
SPECS/kernel.spec
View File

@ -121,13 +121,13 @@ Summary: The Linux kernel
%define kversion 5.14 %define kversion 5.14
%define rpmversion 5.14.0 %define rpmversion 5.14.0
%define pkgrelease 162.22.2.rt21.186.el9_1 %define pkgrelease 162.23.1.rt21.186.el9_1
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 14 %define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 162.22.2.rt21.186%{?buildid}%{?dist} %define specrelease 162.23.1.rt21.186%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
@ -706,7 +706,7 @@ BuildRequires: lld
# exact git commit you can run # exact git commit you can run
# #
# xzcat -qq ${TARBALL} | git get-tar-commit-id # xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.14.0-162.22.2.rt21.186.el9_1.tar.xz Source0: linux-5.14.0-162.23.1.rt21.186.el9_1.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1409,8 +1409,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-5.14.0-162.22.2.rt21.186.el9_1 -c %setup -q -n kernel-5.14.0-162.23.1.rt21.186.el9_1 -c
mv linux-5.14.0-162.22.2.rt21.186.el9_1 linux-%{KVERREL} mv linux-5.14.0-162.23.1.rt21.186.el9_1 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -3122,11 +3122,14 @@ fi
# #
# #
%changelog %changelog
* Thu Mar 16 2023 Lucas Zampieri <lzampier@redhat.com> [5.14.0-162.22.2.rt21.186.el9_1] * Fri Mar 24 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.23.1.rt21.186.el9_1]
- [rt] build kernel-rt-5.14.0-162.22.2.rt21.186.el9_1 [2170460] - [rt] build kernel-rt-5.14.0-162.23.1.rt21.186.el9_1 [2170460]
- ovl: fail on invalid uid/gid mapping at copy up (Miklos Szeredi) [2165353] {CVE-2023-0386}
* Thu Mar 16 2023 Lucas Zampieri <lzampier@redhat.com> [5.14.0-162.22.2.rt21.186.el9_1] - intel_idle: make SPR C1 and C1E be independent (David Arcari) [2168361]
- [rt] build kernel-rt-5.14.0-162.22.2.rt21.186.el9_1 [2170460] - intel_idle: Add a new flag to initialize the AMX state (David Arcari) [2168361]
- x86/fpu: Add a helper to prepare AMX state for low-power CPU idle (David Arcari) [2168361]
- x86/insn: Add AMX instructions to the x86 instruction decoder (Michael Petlan) [2168361]
- futex: Resend potentially swallowed owner death notification (Rafael Aquini) [2168836]
- tun: avoid double free in tun_free_netdev (Jon Maloy) [2156376] {CVE-2022-4744} - tun: avoid double free in tun_free_netdev (Jon Maloy) [2156376] {CVE-2022-4744}
* Thu Mar 09 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.22.1.rt21.185.el9_1] * Thu Mar 09 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.22.1.rt21.185.el9_1]