Merge branch 'c9' into a9

This commit is contained in:
Andrew Lukoshko 2024-06-10 11:22:35 +00:00
commit f575f974bb
4 changed files with 24 additions and 11 deletions

6
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/kernel-abi-stablelists-5.14.0-427.18.1.el9_4.tar.bz2
SOURCES/kernel-kabi-dw-5.14.0-427.18.1.el9_4.tar.bz2
SOURCES/linux-5.14.0-427.18.1.el9_4.tar.xz
SOURCES/kernel-abi-stablelists-5.14.0-427.20.1.el9_4.tar.bz2
SOURCES/kernel-kabi-dw-5.14.0-427.20.1.el9_4.tar.bz2
SOURCES/linux-5.14.0-427.20.1.el9_4.tar.xz
SOURCES/nvidiagpuoot001.x509
SOURCES/olima1.x509
SOURCES/olimaca1.x509

View File

@ -1,6 +1,6 @@
8382e26a9856bb84bbd878e390c09378c985b08b SOURCES/kernel-abi-stablelists-5.14.0-427.18.1.el9_4.tar.bz2
bcf9efe4b0d6bb58ccefdf74b45ad736a1fef354 SOURCES/kernel-kabi-dw-5.14.0-427.18.1.el9_4.tar.bz2
9b76986cc4f145f8e6829dc9799c91a6778e868e SOURCES/linux-5.14.0-427.18.1.el9_4.tar.xz
dfe675ee84af903af3a96b390ac1cef9c44d2949 SOURCES/kernel-abi-stablelists-5.14.0-427.20.1.el9_4.tar.bz2
6c88682846a4dab5cd7e4711bba5aebe78b691b1 SOURCES/kernel-kabi-dw-5.14.0-427.20.1.el9_4.tar.bz2
dcd90a2edd9d254c317bfd518d97a28694fa93f8 SOURCES/linux-5.14.0-427.20.1.el9_4.tar.xz
4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509
706ae01dd14efa38f0f565a3706acac19c78df02 SOURCES/olima1.x509
6e3f0d61414c0b50f48dc2d4c3b3cd024e1c3a43 SOURCES/olimaca1.x509

View File

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

View File

@ -165,15 +165,15 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 5.14.0
%define patchversion 5.14
%define pkgrelease 427.18.1
%define pkgrelease 427.20.1
%define kversion 5
%define tarfile_release 5.14.0-427.18.1.el9_4
%define tarfile_release 5.14.0-427.20.1.el9_4
# This is needed to do merge window version magic
%define patchlevel 14
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 427.18.1%{?buildid}%{?dist}
%define specrelease 427.20.1%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 5.14.0-427.18.1.el9_4
%define kabiversion 5.14.0-427.20.1.el9_4
#
# End of genspec.sh variables
@ -3735,6 +3735,19 @@ fi
#
#
%changelog
* Thu May 23 2024 Scott Weaver <scweaver@redhat.com> [5.14.0-427.20.1.el9_4]
- ipv6: sr: fix possible use-after-free and null-ptr-deref (Hangbin Liu) [RHEL-33968 RHEL-31732] {CVE-2024-26735}
- idpf: fix kernel panic on unknown packet types (Michal Schmidt) [RHEL-36145 RHEL-29035]
- idpf: refactor some missing field get/prep conversions (Michal Schmidt) [RHEL-36145 RHEL-29035]
- PCI: Fix pci_rh_check_status() call semantics (Luiz Capitulino) [RHEL-36541 RHEL-35032]
- cxgb4: Properly lock TX queue for the selftest. (John B. Wyatt IV) [RHEL-36530 RHEL-31990 RHEL-9354]
* Mon May 20 2024 Scott Weaver <scweaver@redhat.com> [5.14.0-427.19.1.el9_4]
- x86/mce: Cleanup mce_usable_address() (Prarit Bhargava) [RHEL-33810 RHEL-25415]
- x86/mce: Define amd_mce_usable_address() (Prarit Bhargava) [RHEL-33810 RHEL-25415]
- x86/MCE/AMD: Split amd_mce_is_memory_error() (Prarit Bhargava) [RHEL-33810 RHEL-25415]
- fs: sysfs: Fix reference leak in sysfs_break_active_protection() (Ewan D. Milne) [RHEL-35302 RHEL-35078] {CVE-2024-26993}
* Mon May 13 2024 Scott Weaver <scweaver@redhat.com> [5.14.0-427.18.1.el9_4]
- netfilter: nf_tables: disallow anonymous set with timeout flag (Phil Sutter) [RHEL-32971 RHEL-30082] {CVE-2024-26642}
- netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout (Phil Sutter) [RHEL-33070 RHEL-30078] {CVE-2024-26643}