From: Jian Yu <yujian@whamcloud.com>
Date: Mon, 8 Jun 2020 22:33:10 +0000 (-0700)
Subject: LU-13345 kernel: kernel update SLES12 SP4 [4.12.14-95.48.1]
X-Git-Tag: 2.13.55~100
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=3bd469b9d3a5e6f821310abbd4589ed9d264f72f;ds=sidebyside

LU-13345 kernel: kernel update SLES12 SP4 [4.12.14-95.48.1]

Update SLES12 SP4 kernel to 4.12.14-95.48.1 for Lustre client.

Test-Parameters: trivial clientdistro=sles12sp4 \
env=LNET_SELFTEST_EXCEPT=smoke,SANITY_EXCEPT="56oc 817"

Change-Id: I1c6971001e813807d37cc177c9969bad78048cf0
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/38247
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 1c750e1..4caa619 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -20,7 +20,7 @@ TBD Whamcloud
        * Client primary unpatched kernels built and tested during release cycle:
          3.10.0-1062.18.1.el7 (RHEL7.7)
          3.10.0-1127.8.2.el7  (RHEL7.8)
-         4.12.14-95.45        (SLES12 SP4)
+         4.12.14-95.48        (SLES12 SP4)
          4.12.14-122.20       (SLES12 SP5)
          4.12.14-197.37       (SLES15 SP1)
          4.15.0-48            (Ubuntu 18.04)
diff --git a/lustre/kernel_patches/targets/4.12-sles12sp4.target.in b/lustre/kernel_patches/targets/4.12-sles12sp4.target.in
index cc1f1c4..b0031f3 100644
--- a/lustre/kernel_patches/targets/4.12-sles12sp4.target.in
+++ b/lustre/kernel_patches/targets/4.12-sles12sp4.target.in
@@ -1,6 +1,6 @@
 lnxmaj="4.12"
 lnxmin=".14"
-lnxrel="95.45"
+lnxrel="95.48"
 # 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