diff --git a/.gitignore b/.gitignore index 69bbb968c..5c3b45f20 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -SOURCES/kernel-abi-stablelists-5.14.0-570.17.1.el9_6.tar.bz2 -SOURCES/kernel-kabi-dw-5.14.0-570.17.1.el9_6.tar.bz2 -SOURCES/linux-5.14.0-570.17.1.el9_6.tar.xz +SOURCES/kernel-abi-stablelists-5.14.0-570.18.1.el9_6.tar.bz2 +SOURCES/kernel-kabi-dw-5.14.0-570.18.1.el9_6.tar.bz2 +SOURCES/linux-5.14.0-570.18.1.el9_6.tar.xz SOURCES/nvidiagpuoot001.x509 SOURCES/olima1.x509 SOURCES/olimaca1.x509 diff --git a/.kernel.metadata b/.kernel.metadata index 28b244a7c..d39843035 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,6 +1,6 @@ -40504f40c13b052b2162b397ca29c9b4215992d5 SOURCES/kernel-abi-stablelists-5.14.0-570.17.1.el9_6.tar.bz2 -d218c5ddc727978e57aec4da142c50fc664d7ad2 SOURCES/kernel-kabi-dw-5.14.0-570.17.1.el9_6.tar.bz2 -44f3fde3ea21c1a381636785cdad3631a78aae39 SOURCES/linux-5.14.0-570.17.1.el9_6.tar.xz +f989500f2927b2c4382616adbdebcf103b9b27c7 SOURCES/kernel-abi-stablelists-5.14.0-570.18.1.el9_6.tar.bz2 +4f6681fae2da563e2290349683362fe2c7bfe088 SOURCES/kernel-kabi-dw-5.14.0-570.18.1.el9_6.tar.bz2 +0b98cacad87ba9740001e32a194fc229c57fc85d SOURCES/linux-5.14.0-570.18.1.el9_6.tar.xz 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509 706ae01dd14efa38f0f565a3706acac19c78df02 SOURCES/olima1.x509 6e3f0d61414c0b50f48dc2d4c3b3cd024e1c3a43 SOURCES/olimaca1.x509 diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index 5f9cada5e..e91520f46 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 6 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 570.17.1 +RHEL_RELEASE = 570.18.1 # # ZSTREAM diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog index de94ea4b3..88473d279 100644 --- a/SOURCES/kernel.changelog +++ b/SOURCES/kernel.changelog @@ -1,3 +1,18 @@ +* Tue May 20 2025 CKI KWF Bot [5.14.0-570.18.1.el9_6] +- gitlab-ci: use rhel9.6 builder image (Michael Hofmann) +- cifs: Fix integer overflow while processing acregmax mount option (CKI Backport Bot) [RHEL-87921] {CVE-2025-21964} +- Bluetooth: btusb: Add one more ID 0x0489:0xe0f3 for Qualcomm WCN785x (David Marlin) [RHEL-85647] +- drm/i915/dp_mst: Don't require DSC hblank quirk for a non-DSC compatible mode (Jocelyn Falempe) [RHEL-85393] +- drm/i915/dp_mst: Handle error during DSC BW overhead/slice calculation (Jocelyn Falempe) [RHEL-85393] +- drm/i915/display: Use joined pipes in dsc helpers for slices, bpp (Jocelyn Falempe) [RHEL-85393] +- drm/i915/display: Use joined pipes in intel_mode_valid_max_plane_size (Jocelyn Falempe) [RHEL-85393] +- drm/i915/display: Use joined pipes in intel_dp_joiner_needs_dsc (Jocelyn Falempe) [RHEL-85393] +- drm/i915/display: Simplify intel_joiner_num_pipes and its usage (Jocelyn Falempe) [RHEL-85393] +- drm/i915/display: Check whether platform supports joiner (Jocelyn Falempe) [RHEL-85393] +- Revert "drm/i915/dp_mst: Handle error during DSC BW overhead/slice calculation" (Jocelyn Falempe) [RHEL-85393] +- Revert "drm/i915/dp_mst: Don't require DSC hblank quirk for a non-DSC compatible mode" (Jocelyn Falempe) [RHEL-85393] +Resolves: RHEL-85393, RHEL-85647, RHEL-87921 + * Mon May 12 2025 Patrick Talbert [5.14.0-570.17.1.el9_6] - vsock: Orphan socket after transport release (Jay Shin) [RHEL-89113] {CVE-2025-21756} - vsock: Keep the binding until socket destruction (Jay Shin) [RHEL-89113] {CVE-2025-21756} diff --git a/SOURCES/uki_addons.json b/SOURCES/uki_addons.json index b34e031b3..da3fe449f 100644 --- a/SOURCES/uki_addons.json +++ b/SOURCES/uki_addons.json @@ -1,45 +1,45 @@ { + "common": { + "crashkernel-1536M.addon": [ + "crashkernel=1536M\n" + ], + "crashkernel-192M.addon": [ + "crashkernel=192M\n" + ], + "crashkernel-1G.addon": [ + "crashkernel=1G\n" + ], + "crashkernel-256M.addon": [ + "crashkernel=256M\n" + ], + "crashkernel-2G.addon": [ + "crashkernel=2G\n" + ], + "crashkernel-512M.addon": [ + "crashkernel=512M\n" + ], + "crashkernel-default.addon": [ + "crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M\n" + ], + "debug.addon": [ + "debug\n" + ] + }, "virt": { + "common": { + "fips-disable.addon": [ + "fips=0\n" + ], + "fips-enable.addon": [ + "fips=1\n" + ] + }, "rhel": { "aarch64": { "crashkernel-default.addon": [ "crashkernel=1G-4G:256M,4G-64G:320M,64G-:576M\n" ] } - }, - "common": { - "fips-enable.addon": [ - "fips=1\n" - ], - "fips-disable.addon": [ - "fips=0\n" - ] } - }, - "common": { - "debug.addon": [ - "debug\n" - ], - "crashkernel-default.addon": [ - "crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M\n" - ], - "crashkernel-512M.addon": [ - "crashkernel=512M\n" - ], - "crashkernel-2G.addon": [ - "crashkernel=2G\n" - ], - "crashkernel-256M.addon": [ - "crashkernel=256M\n" - ], - "crashkernel-1G.addon": [ - "crashkernel=1G\n" - ], - "crashkernel-192M.addon": [ - "crashkernel=192M\n" - ], - "crashkernel-1536M.addon": [ - "crashkernel=1536M\n" - ] } } \ No newline at end of file diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 03440fc41..27320c002 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -165,15 +165,15 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.14.0 %define patchversion 5.14 -%define pkgrelease 570.17.1 +%define pkgrelease 570.18.1 %define kversion 5 -%define tarfile_release 5.14.0-570.17.1.el9_6 +%define tarfile_release 5.14.0-570.18.1.el9_6 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 570.17.1%{?buildid}%{?dist} +%define specrelease 570.18.1%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.14.0-570.17.1.el9_6 +%define kabiversion 5.14.0-570.18.1.el9_6 # # End of genspec.sh variables @@ -3863,7 +3863,7 @@ fi # # %changelog -* Sat May 24 2025 Andrei Lukoshko - 5.14.0-570.17.1 +* Wed May 28 2025 Andrei Lukoshko - 5.14.0-570.18.1 - 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 @@ -3874,11 +3874,25 @@ fi - kernel/rh_messages.h: enable all disabled pci devices by moving to unmaintained -* Sat May 24 2025 Eduard Abdullin - 5.14.0-570.17.1 +* Wed May 28 2025 Eduard Abdullin - 5.14.0-570.18.1 - Use AlmaLinux OS secure boot cert - Debrand for AlmaLinux OS - Add KVM support for ppc64le +* Tue May 20 2025 CKI KWF Bot [5.14.0-570.18.1.el9_6] +- gitlab-ci: use rhel9.6 builder image (Michael Hofmann) +- cifs: Fix integer overflow while processing acregmax mount option (CKI Backport Bot) [RHEL-87921] {CVE-2025-21964} +- Bluetooth: btusb: Add one more ID 0x0489:0xe0f3 for Qualcomm WCN785x (David Marlin) [RHEL-85647] +- drm/i915/dp_mst: Don't require DSC hblank quirk for a non-DSC compatible mode (Jocelyn Falempe) [RHEL-85393] +- drm/i915/dp_mst: Handle error during DSC BW overhead/slice calculation (Jocelyn Falempe) [RHEL-85393] +- drm/i915/display: Use joined pipes in dsc helpers for slices, bpp (Jocelyn Falempe) [RHEL-85393] +- drm/i915/display: Use joined pipes in intel_mode_valid_max_plane_size (Jocelyn Falempe) [RHEL-85393] +- drm/i915/display: Use joined pipes in intel_dp_joiner_needs_dsc (Jocelyn Falempe) [RHEL-85393] +- drm/i915/display: Simplify intel_joiner_num_pipes and its usage (Jocelyn Falempe) [RHEL-85393] +- drm/i915/display: Check whether platform supports joiner (Jocelyn Falempe) [RHEL-85393] +- Revert "drm/i915/dp_mst: Handle error during DSC BW overhead/slice calculation" (Jocelyn Falempe) [RHEL-85393] +- Revert "drm/i915/dp_mst: Don't require DSC hblank quirk for a non-DSC compatible mode" (Jocelyn Falempe) [RHEL-85393] + * Mon May 12 2025 Patrick Talbert [5.14.0-570.17.1.el9_6] - vsock: Orphan socket after transport release (Jay Shin) [RHEL-89113] {CVE-2025-21756} - vsock: Keep the binding until socket destruction (Jay Shin) [RHEL-89113] {CVE-2025-21756}