From 72cc77e642d6cb696532f3c902680ac04340aa08 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Thu, 20 Jun 2024 15:26:19 -0700 Subject: [PATCH] LU-17404 kernel: update RHEL 9.4 [5.14.0-427.22.1.el9_4] Update RHEL 9.4 kernel to 5.14.0-427.22.1.el9_4. Test-Parameters: trivial fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el9.4 serverdistro=el9.3 testlist=sanity Test-Parameters: trivial fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el9.4 serverdistro=el9.3 testlist=sanity Test-Parameters: trivial fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el9.3 serverdistro=el9.4 testlist=sanity Test-Parameters: trivial fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el9.3 serverdistro=el9.4 testlist=sanity Test-Parameters: optional clientdistro=el9.4 serverdistro=el9.4 \ testgroup=full-part-1 Test-Parameters: optional clientdistro=el9.4 serverdistro=el9.4 \ testgroup=full-part-2 Test-Parameters: optional clientdistro=el9.4 serverdistro=el9.4 \ testgroup=full-part-3 Change-Id: Icb9aac22fbc4b7d34d13288e98fa4c28022db82e Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55487 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: Yang Sheng Reviewed-by: Andreas Dilger --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-5.14.0-5.14-rhel9.4-x86_64.config | 2 +- lustre/kernel_patches/targets/5.14-rhel9.4.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 712e646..a00ce510 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-427.20.1.el9 (RHEL9.4) + 5.14.0-427.22.1.el9 (RHEL9.4) 5.14.0-362.24.1.el9 (RHEL9.3) 4.18.0-553.el8 (RHEL8.10) 4.18.0-513.24.1.el8 (RHEL8.9) @@ -37,7 +37,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-427.20.1.el9 (RHEL9.4) + 5.14.0-427.22.1.el9 (RHEL9.4) 5.14.0-362.24.1.el9 (RHEL9.3) 4.18.0-553.el8 (RHEL8.10) 4.18.0-513.24.1.el8 (RHEL8.9) diff --git a/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.4-x86_64.config index 15b499d..8a3129b 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.4-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.4-x86_64.config @@ -32,7 +32,7 @@ CONFIG_WERROR=y CONFIG_UAPI_HEADER_TEST=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_BUILD_SALT="5.14.0-427.20.1.el9_4.x86_64" +CONFIG_BUILD_SALT="5.14.0-427.22.1.el9_4.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.4.target.in b/lustre/kernel_patches/targets/5.14-rhel9.4.target.in index 3075907..930d8e5 100644 --- a/lustre/kernel_patches/targets/5.14-rhel9.4.target.in +++ b/lustre/kernel_patches/targets/5.14-rhel9.4.target.in @@ -1,5 +1,5 @@ lnxmaj="5.14.0" -lnxrel="427.20.1.el9_4" +lnxrel="427.22.1.el9_4" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=5.14-rhel9.4.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 7cef1f6..2ea4da2 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -24,6 +24,6 @@ PATCH SERIES FOR SERVER KERNELS: 5.14-rhel9.1.series 5.14.0-162.23.1.el9 (RHEL 9.1) 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.20.1.el9 (RHEL 9.4) +5.14-rhel9.4.series 5.14.0-427.22.1.el9 (RHEL 9.4) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1