From 39df815cd6bf0a9dcd0a5e034b749726b194c953 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 8 Aug 2023 15:43:03 -0700 Subject: [PATCH] LU-17020 kernel: update RHEL 9.2 [5.14.0-284.25.1.el9_2] Update RHEL 9.2 kernel to 5.14.0-284.25.1.el9_2. Test-Parameters: trivial fstype=ldiskfs \ clientdistro=el9.2 serverdistro=el9.2 testlist=sanity Test-Parameters: trivial fstype=zfs \ clientdistro=el9.2 serverdistro=el9.2 testlist=sanity Change-Id: Icdbd9cfa18a72d3e6f09f366952e6e0f2ac1ebd2 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51886 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-5.14.0-5.14-rhel9.2-x86_64.config | 2 +- lustre/kernel_patches/targets/5.14-rhel9.2.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 942cea7..fa1b702 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-284.18.1.el9 (RHEL9.2) + 5.14.0-284.25.1.el9 (RHEL9.2) 5.14.0-162.23.1.el9 (RHEL9.1) 4.18.0-477.15.1.el8 (RHEL8.8) * Other server kernels known to build and work at some point (others may also work): @@ -32,7 +32,7 @@ TBD Whamcloud 5.10.0-136.32.0.108.oe2203sp1 (openEuler 22.03 LTS SP1) * ldiskfs needs an ldiskfs patch series for that kernel, ZFS does not * Client primary kernels built and tested during release cycle: - 5.14.0-284.18.1.el9 (RHEL9.2) + 5.14.0-284.25.1.el9 (RHEL9.2) 5.14.0-162.23.1.el9 (RHEL9.1) 4.18.0-477.15.1.el8 (RHEL8.8) 5.4.0-37 (Ubuntu 20.04) diff --git a/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.2-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.2-x86_64.config index cd6c107..afae554 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.2-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-5.14.0-5.14-rhel9.2-x86_64.config @@ -32,7 +32,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_UAPI_HEADER_TEST=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_BUILD_SALT="5.14.0-284.18.1.el9_2.x86_64" +CONFIG_BUILD_SALT="5.14.0-284.25.1.el9_2.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.2.target.in b/lustre/kernel_patches/targets/5.14-rhel9.2.target.in index cc7a695..949e096 100644 --- a/lustre/kernel_patches/targets/5.14-rhel9.2.target.in +++ b/lustre/kernel_patches/targets/5.14-rhel9.2.target.in @@ -1,5 +1,5 @@ lnxmaj="5.14.0" -lnxrel="284.18.1.el9_2" +lnxrel="284.25.1.el9_2" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=5.14-rhel9.2.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 4f338bd..b00518b 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -27,6 +27,6 @@ PATCH SERIES FOR SERVER KERNELS: 4.18-rhel8.7.series 4.18.0-425.10.1.el8 (RHEL 8.7) 4.18-rhel8.8.series 4.18.0-477.15.1.el8 (RHEL 8.8) 5.14-rhel9.1.series 5.14.0-162.23.1.el9 (RHEL 9.1) -5.14-rhel9.2.series 5.14.0-284.18.1.el9 (RHEL 9.2) +5.14-rhel9.2.series 5.14.0-284.25.1.el9 (RHEL 9.2) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1