From: Jian Yu <yujian@whamcloud.com>
Date: Fri, 20 May 2022 20:06:59 +0000 (-0700)
Subject: LU-15793 kernel: kernel update RHEL8.5 [4.18.0-348.23.1.el8_5]
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c0a566f12fe0acfd2e7215e8c1c2ea428d8552ae;p=fs%2Flustre-release.git

LU-15793 kernel: kernel update RHEL8.5 [4.18.0-348.23.1.el8_5]

Update RHEL8.5 kernel to 4.18.0-348.23.1.el8_5.

Test-Parameters: trivial fstype=ldiskfs clientdistro=el8.5 serverdistro=el8.5 testlist=sanity
Test-Parameters: trivial fstype=zfs clientdistro=el8.5 serverdistro=el8.5 testlist=sanity
Change-Id: I9724e304c2d32bb0ac2dcf4138438c79d4abca0f
Signed-off-by: Jian Yu <yujian@whamcloud.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 900878e..925c56a 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -12,7 +12,7 @@
          4.18.0-193.28.1.el8  (RHEL8.2)
          4.18.0-240.22.1.el8  (RHEL8.3)
          4.18.0-305.25.1.el8  (RHEL8.4)
-         4.18.0-348.7.1.el8   (RHEL8.5)
+         4.18.0-348.23.1.el8  (RHEL8.5)
          4.15.0-32            (Ubuntu 18.04)
          5.4.0-48             (Ubuntu 20.04)
          5.4.0                (kernel.org)
@@ -37,7 +37,7 @@
          4.18.0-193.28.1.el8  (RHEL8.2)
          4.18.0-240.22.1.el8  (RHEL8.3)
          4.18.0-305.25.1.el8  (RHEL8.4)
-         4.18.0-348.7.1.el8   (RHEL8.5)
+         4.18.0-348.23.1.el8  (RHEL8.5)
          4.18.0-372.9.1.el8   (RHEL8.6)
          4.4.120-92.70        (SLES12 SP2)
          4.4.180-94.100       (SLES12 SP3)
diff --git a/lustre/kernel_patches/targets/4.18-rhel8.5.target.in b/lustre/kernel_patches/targets/4.18-rhel8.5.target.in
index 3aae570..9435d6c 100644
--- a/lustre/kernel_patches/targets/4.18-rhel8.5.target.in
+++ b/lustre/kernel_patches/targets/4.18-rhel8.5.target.in
@@ -1,5 +1,5 @@
 lnxmaj="4.18.0"
-lnxrel="348.7.1.el8_5"
+lnxrel="348.23.1.el8_5"
 
 KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
 SERIES=4.18-rhel8.5.series
diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 009262f..4e55f1d 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -22,6 +22,6 @@ PATCH SERIES FOR SERVER KERNELS:
 4.18-rhel8.2.series     4.18.0-193.28.1.el8  (RHEL 8.2)
 4.18-rhel8.3.series     4.18.0-240.22.1.el8  (RHEL 8.3)
 4.18-rhel8.4.series     4.18.0-305.25.1.el8  (RHEL 8.4)
-4.18-rhel8.5.series     4.18.0-348.7.1.el8   (RHEL 8.5)
+4.18-rhel8.5.series     4.18.0-348.23.1.el8  (RHEL 8.5)
 
 See lustre/ChangeLog for supported client kernel versions.