From: Jian Yu <yujian@whamcloud.com>
Date: Sat, 19 Jun 2021 00:26:07 +0000 (-0700)
Subject: LU-14775 kernel: kernel update SLES12 SP5 [4.12.14-122.74.1]
X-Git-Tag: 2.14.54~9
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=76c71a167b999013ba6ddb4d6a2e37dabd3a1f0c;p=fs%2Flustre-release.git

LU-14775 kernel: kernel update SLES12 SP5 [4.12.14-122.74.1]

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

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

Change-Id: I98952c097b14c68f744a570e5558fb21d9392ad2
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/44037
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 842a902..a44b73e 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -26,7 +26,7 @@ TBD Whamcloud
          3.10.0-1127.19.1.el7 (RHEL7.8)
          3.10.0-1160.25.1.el7 (RHEL7.9)
          4.12.14-95.48        (SLES12 SP4)
-         4.12.14-122.66       (SLES12 SP5)
+         4.12.14-122.74       (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 75c9990..03ec611 100644
--- a/lustre/kernel_patches/targets/4.12-sles12sp5.target.in
+++ b/lustre/kernel_patches/targets/4.12-sles12sp5.target.in
@@ -1,10 +1,10 @@
 lnxmaj="4.12"
 lnxmin=".14"
-lnxrel="122.66"
+lnxrel="122.74"
 # 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
-rpmfix=".2"
+rpmfix=".1"
 
 # this is the delimeter that goes before the "smp" at the end of the version
 # defaults to empty