From: Bob Glossman <bob.glossman@intel.com>
Date: Fri, 22 Sep 2017 15:29:55 +0000 (-0700)
Subject: LU-10023 kernel: kernel update [SLES12 SP3 4.4.82-6.9]
X-Git-Tag: 2.10.2-RC1~42
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=9dd5df9b37092739e6f61a29dc7090c93a9b53eb

LU-10023 kernel: kernel update [SLES12 SP3 4.4.82-6.9]

Update target and kernel_config files for new version

Test-Parameters: clientdistro=sles12sp3 testgroup=review-ldiskfs   mdsdistro=sles12sp3 ossdistro=sles12sp3   mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs
Change-Id: Ie65afb3d7356c4679f4f37f4af324e955261b5af
Signed-off-by: Bob Glossman <bob.glossman@intel.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index a2fda8f..edd1637 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -13,7 +13,7 @@
          3.0.101-107         (SLES11 SP4)
          3.12.74-60.64.40    (SLES12 SP1)
          4.4.74-92.38        (SLES12 SP2)
-         4.4.82-6.3          (SLES12 SP3)
+         4.4.82-6.9          (SLES12 SP3)
          vanilla linux 4.6.7 (ZFS only)
        * Client known to build on unpatched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
@@ -26,7 +26,7 @@
          3.0.101-107         (SLES11 SP4)
          3.12.74-60.64.40    (SLES12 SP1)
          4.4.74-92.38        (SLES12 SP2)
-         4.4.82-6.3          (SLES12 SP3)
+         4.4.82-6.9          (SLES12 SP3)
          vanilla linux 4.6.7
        * Recommended e2fsprogs version: 1.42.13.wc4 or newer
        * Recommended ZFS / SPL version: 0.6.5.9
diff --git a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config
index e1714d5..c946efe 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12sp3-x86_64.config
@@ -54,7 +54,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-6.3-default"
+CONFIG_LOCALVERSION="-6.9-default"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
diff --git a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in
index 71aa0bb..e9b83c9 100644
--- a/lustre/kernel_patches/targets/4.4-sles12sp3.target.in
+++ b/lustre/kernel_patches/targets/4.4-sles12sp3.target.in
@@ -1,6 +1,6 @@
 lnxmaj="4.4"
 lnxmin=".82"
-lnxrel="6.3"
+lnxrel="6.9"
 # 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
diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 3768793d..f8bdf39 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -23,6 +23,6 @@ PATCH SERIES FOR SERVER KERNELS:
 3.0-sles11sp3.series    3.0.101-107         (SLES11 SP4)
 3.12-sles12.series      3.12.74-60.64.40    (SLES12 SP1)
 4.4-sles12.series       4.4.74-92.38        (SLES12 SP2)
-4.4-sles12sp3.series    4.4.82-6.3          (SLES12 SP3)
+4.4-sles12sp3.series    4.4.82-6.9          (SLES12 SP3)
 
 See lustre/ChangeLog for supported client kernel versions.