hemu312/kernel
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Stepan Oksanichenko 2023-04-11 14:01:02 +00:00
commit b5205dff5d
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,5 +1,5 @@
SOURCES/kernel-abi-stablelists-5.14.0-162.22.2.el9_1.tar.bz2 SOURCES/kernel-abi-stablelists-5.14.0-162.23.1.el9_1.tar.bz2
SOURCES/kernel-kabi-dw-5.14.0-162.22.2.el9_1.tar.bz2 SOURCES/kernel-kabi-dw-5.14.0-162.23.1.el9_1.tar.bz2
SOURCES/linux-5.14.0-162.22.2.el9_1.tar.xz SOURCES/linux-5.14.0-162.23.1.el9_1.tar.xz
SOURCES/rheldup3.x509 SOURCES/rheldup3.x509
SOURCES/rhelkpatch1.x509 SOURCES/rhelkpatch1.x509

6
.kernel.metadata
View File

@ -1,5 +1,5 @@
d47517429c707f43f125a9dd99ae700e165e8d89 SOURCES/kernel-abi-stablelists-5.14.0-162.22.2.el9_1.tar.bz2 338af593559808182b1a265f572c6aee75835d17 SOURCES/kernel-abi-stablelists-5.14.0-162.23.1.el9_1.tar.bz2
21924b65969ad51155a61403a5c1db474f050f8b SOURCES/kernel-kabi-dw-5.14.0-162.22.2.el9_1.tar.bz2 a8e535c0521c2ae5179cc76df76ea179b2403e97 SOURCES/kernel-kabi-dw-5.14.0-162.23.1.el9_1.tar.bz2
33508bffa9aec76e83766d2c1d641c0bd1ebc222 SOURCES/linux-5.14.0-162.22.2.el9_1.tar.xz 68f099d837272238f5ffed430b29bb9fd177d46e SOURCES/linux-5.14.0-162.23.1.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

20
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.el9_1 %define pkgrelease 162.23.1.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%{?buildid}%{?dist} %define specrelease 162.23.1%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
@ -678,7 +678,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.el9_1.tar.xz Source0: linux-5.14.0-162.23.1.el9_1.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1338,8 +1338,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-5.14.0-162.22.2.el9_1 -c %setup -q -n kernel-5.14.0-162.23.1.el9_1 -c
mv linux-5.14.0-162.22.2.el9_1 linux-%{KVERREL} mv linux-5.14.0-162.23.1.el9_1 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -2993,8 +2993,14 @@ fi
# #
# #
%changelog %changelog
* Wed Mar 15 2023 Lucas Zampieri <lzampier@redhat.com> [5.14.0-162.22.2.el9_1] * Thu Mar 23 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.23.1.el9_1]
- tun: avoid double free in tun_free_netdev (Jon Maloy) [2156373] {CVE-2022-4744} - ovl: fail on invalid uid/gid mapping at copy up (Miklos Szeredi) [2165344 2165345] {CVE-2023-0386}
- intel_idle: make SPR C1 and C1E be independent (David Arcari) [2168361 2125352]
- intel_idle: Add a new flag to initialize the AMX state (David Arcari) [2168361 2117766]
- x86/fpu: Add a helper to prepare AMX state for low-power CPU idle (David Arcari) [2168361 2117766]
- x86/insn: Add AMX instructions to the x86 instruction decoder (Michael Petlan) [2168361 2140492]
- futex: Resend potentially swallowed owner death notification (Rafael Aquini) [2168836 2161817]
- tun: avoid double free in tun_free_netdev (Jon Maloy) [2156373 2156374] {CVE-2022-4744}
* Thu Mar 09 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.22.1.el9_1] * Thu Mar 09 2023 Patrick Talbert <ptalbert@redhat.com> [5.14.0-162.22.1.el9_1]
- ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF (Jaroslav Kysela) [2163390 2125540] {CVE-2023-0266} - ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF (Jaroslav Kysela) [2163390 2125540] {CVE-2023-0266}