From 634bc137bcb8c54fbea805db8fbde14c90c25efa Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Wed, 12 Mar 2025 00:36:46 -0700 Subject: [PATCH] LU-18794 kernel: update RHEL 9.5 [5.14.0-503.31.1.el9_5] Update RHEL 9.5 kernel to 5.14.0-503.31.1.el9_5. Test-Parameters: trivial fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el9.5 serverdistro=el9.4 testlist=sanity Test-Parameters: trivial fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el9.4 serverdistro=el9.5 testlist=sanity Test-Parameters: optional fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el9.5 serverdistro=el9.5 testgroup=full-dne-part-1 Test-Parameters: optional fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el9.5 serverdistro=el9.5 testgroup=full-dne-part-2 Test-Parameters: optional fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el9.5 serverdistro=el9.5 testgroup=full-dne-part-3 Test-Parameters: optional fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el9.5 serverdistro=el9.5 testgroup=full-dne-zfs-part-1 Test-Parameters: optional fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el9.5 serverdistro=el9.5 testgroup=full-dne-zfs-part-2 Test-Parameters: optional fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el9.5 serverdistro=el9.5 testgroup=full-dne-zfs-part-3 Change-Id: Ie6ec03efef1ec6f5c2d165a0e0ac6c3d3a4fd54c Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58378 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Alex Deiter Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-5.14.0-5.14-rhel9.5-x86_64.config | 2 +- lustre/kernel_patches/targets/5.14-rhel9.5.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 03e5a92..dee4375 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -3,7 +3,7 @@ TBD Whamcloud * See https://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix for currently supported client and server kernel versions. * Server primary kernels built and tested during release cycle: - 5.14.0-503.26.1.el9 (RHEL9.5) + 5.14.0-503.31.1.el9 (RHEL9.5) 5.14.0-427.42.1.el9 (RHEL9.4) 5.14.0-362.24.1.el9 (RHEL9.3) 4.18.0-553.44.1.el8 (RHEL8.10) @@ -43,7 +43,7 @@ TBD Whamcloud 5.10.0-153.19.0.95.oe2203sp2 (openEuler 22.03 LTS SP2) * ldiskfs needs an ldiskfs patch series for that kernel, ZFS does not * Client primary kernels built and tested during release cycle: - 5.14.0-503.26.1.el9 (RHEL9.5) + 5.14.0-503.31.1.el9 (RHEL9.5) 5.14.0-427.42.1.el9 (RHEL9.4) 5.14.0-362.24.1.el9 (RHEL9.3) 4.18.0-553.44.1.el8 (RHEL8.10) diff --git a/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.5-x86_64.config index 238bdaa..2e741fe 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.5-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.5-x86_64.config @@ -31,7 +31,7 @@ CONFIG_WERROR=y CONFIG_UAPI_HEADER_TEST=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_BUILD_SALT="5.14.0-503.26.1.el9_5.x86_64" +CONFIG_BUILD_SALT="5.14.0-503.31.1.el9_5.x86_64" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y diff --git a/lustre/kernel_patches/targets/5.14-rhel9.5.target.in b/lustre/kernel_patches/targets/5.14-rhel9.5.target.in index c78d62a..7928187 100644 --- a/lustre/kernel_patches/targets/5.14-rhel9.5.target.in +++ b/lustre/kernel_patches/targets/5.14-rhel9.5.target.in @@ -1,5 +1,5 @@ lnxmaj="5.14.0" -lnxrel="503.26.1.el9_5" +lnxrel="503.31.1.el9_5" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=5.14-rhel9.5.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index b78e404..60cc9c4 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -25,6 +25,6 @@ PATCH SERIES FOR SERVER KERNELS: 5.14-rhel9.2.series 5.14.0-284.30.1.el9 (RHEL 9.2) 5.14-rhel9.3.series 5.14.0-362.24.1.el9 (RHEL 9.3) 5.14-rhel9.4.series 5.14.0-427.42.1.el9 (RHEL 9.4) -5.14-rhel9.5.series 5.14.0-503.26.1.el9 (RHEL 9.5) +5.14-rhel9.5.series 5.14.0-503.31.1.el9 (RHEL 9.5) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1