From: Jian Yu <yujian@whamcloud.com>
Date: Mon, 6 Sep 2021 01:47:38 +0000 (-0700)
Subject: LU-14934 kernel: kernel update SLES12 SP5 [4.12.14-122.83.1]
X-Git-Tag: 2.14.55~37
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=b7647cf91d0406fdae8fcc771208a7a16c6d39f6

LU-14934 kernel: kernel update SLES12 SP5 [4.12.14-122.83.1]

Update SLES12 SP5 kernel to 4.12.14-122.83.1 for Lustre client.

Test-Parameters: trivial clientdistro=sles12sp5 \
env=SANITY_EXCEPT="56oc 430c 817" testlist=sanity

Change-Id: I2b35d129550b895324bb3e2e61910ad10e846f03
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/44848
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index aadabcc..fde2dcd 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -28,7 +28,7 @@ TBD Whamcloud
          3.10.0-1127.19.1.el7 (RHEL7.8)
          3.10.0-1160.36.2.el7 (RHEL7.9)
          4.12.14-95.48        (SLES12 SP4)
-         4.12.14-122.74       (SLES12 SP5)
+         4.12.14-122.83       (SLES12 SP5)
          4.12.14-197.75       (SLES15 SP1)
          5.3.18-24.61         (SLES15 SP2)
          4.15.0-48            (Ubuntu 18.04)
diff --git a/lustre/kernel_patches/targets/4.12-sles12sp5.target.in b/lustre/kernel_patches/targets/4.12-sles12sp5.target.in
index 03ec611..8211f87 100644
--- a/lustre/kernel_patches/targets/4.12-sles12sp5.target.in
+++ b/lustre/kernel_patches/targets/4.12-sles12sp5.target.in
@@ -1,6 +1,6 @@
 lnxmaj="4.12"
 lnxmin=".14"
-lnxrel="122.74"
+lnxrel="122.83"
 # use this when there is an "RPM fix" which means that the name of the
 # (source) RPM has been updated but the version of the kernel inside the
 # RPM is not also updated