From 518263174b5d03d293b2bf97e7609e9e87a70d6b Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Fri, 1 Mar 2024 10:23:10 -0800 Subject: [PATCH] LU-17561 kernel: update RHEL 9.3 [5.14.0-362.18.1.el9_3] Update RHEL 9.3 kernel to 5.14.0-362.18.1.el9_3. Test-Parameters: trivial fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el9.3 serverdistro=el9.2 testlist=sanity Test-Parameters: trivial fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el9.3 serverdistro=el9.2 testlist=sanity Test-Parameters: trivial fstype=ldiskfs mdtcount=4 mdscount=2 \ clientdistro=el9.2 serverdistro=el9.3 testlist=sanity Test-Parameters: trivial fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el9.2 serverdistro=el9.3 testlist=sanity Test-Parameters: optional clientdistro=el9.3 serverdistro=el9.3 \ testgroup=full-part-1 Test-Parameters: optional clientdistro=el9.3 serverdistro=el9.3 \ testgroup=full-part-2 Test-Parameters: optional clientdistro=el9.3 serverdistro=el9.3 \ testgroup=full-part-3 Change-Id: Iddfe57197d854e0be864c0ce64699f92fcc181d1 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54236 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 6 +++--- .../kernel_configs/kernel-5.14.0-5.14-rhel9.3-x86_64.config | 2 +- lustre/kernel_patches/targets/5.14-rhel9.3.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index a2643f4..c911930 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-362.13.1.el9 (RHEL9.3) + 5.14.0-362.18.1.el9 (RHEL9.3) 5.14.0-284.30.1.el9 (RHEL9.2) 5.14.0-162.23.1.el9 (RHEL9.1) 4.18.0-513.9.1.el8 (RHEL8.9) @@ -35,7 +35,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-362.13.1.el9 (RHEL9.3) + 5.14.0-362.18.1.el9 (RHEL9.3) 5.14.0-284.30.1.el9 (RHEL9.2) 4.18.0-513.9.1.el8 (RHEL8.9) 4.18.0-477.27.1.el8 (RHEL8.8) @@ -73,7 +73,7 @@ TBD Whamcloud 5.11.0-31 (Ubuntu 20.04.3 HWE) 5.11.0 (vanilla kernel.org) 5.10.0 (openEuler 22.03 LTS) - * Recommended e2fsprogs version: 1.47.0-wc5 or newer + * Recommended e2fsprogs version: 1.47.0-wc6 or newer * Recommended ZFS version: 2.1.11 * NFS export disabled when stack size < 8192 (32-bit Lustre clients), since the NFSv4 export of Lustre filesystem with 4K stack may cause a diff --git a/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.3-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.3-x86_64.config index 11e5e02..2ea7ba2 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.3-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.3-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-362.13.1.el9_3.x86_64" +CONFIG_BUILD_SALT="5.14.0-362.18.1.el9_3.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.3.target.in b/lustre/kernel_patches/targets/5.14-rhel9.3.target.in index dc80edb..dd5bbc1 100644 --- a/lustre/kernel_patches/targets/5.14-rhel9.3.target.in +++ b/lustre/kernel_patches/targets/5.14-rhel9.3.target.in @@ -1,5 +1,5 @@ lnxmaj="5.14.0" -lnxrel="362.13.1.el9_3" +lnxrel="362.18.1.el9_3" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=5.14-rhel9.3.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 4108416..697c7e4 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -29,6 +29,6 @@ PATCH SERIES FOR SERVER KERNELS: 4.18-rhel8.9.series 4.18.0-513.9.1.el8 (RHEL 8.9) 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.13.1.el9 (RHEL 9.3) +5.14-rhel9.3.series 5.14.0-362.18.1.el9 (RHEL 9.3) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1