From: Bob Glossman <bob.glossman@intel.com>
Date: Fri, 27 Oct 2017 16:37:41 +0000 (-0700)
Subject: LU-10168 kernel: kernel update [SLES12 SP2 4.4.90-92.45]
X-Git-Tag: 2.10.56~40
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F29839%2F5;p=fs%2Flustre-release.git

LU-10168 kernel: kernel update [SLES12 SP2 4.4.90-92.45]

Update target and kernel_config files for new version

Test-Parameters: clientdistro=sles12sp2 testgroup=review-ldiskfs \
  mdsdistro=sles12sp2 ossdistro=sles12sp2 \
  mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: If24eddeeadc825b1b3073439304c0958c0ae1b74
Reviewed-on: https://review.whamcloud.com/29839
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/contrib/lbuild/lbuild-sles12 b/contrib/lbuild/lbuild-sles12
index 4430a19..e76188d 100644
--- a/contrib/lbuild/lbuild-sles12
+++ b/contrib/lbuild/lbuild-sles12
@@ -20,7 +20,7 @@ kernel_srpm_location() {
 	;;
     4.4)
 	site="http://mgmt/cobbler/repo_mirror/updates-sles12.2-src"
-	if [ ${lnxmin##.} -gt 80 ]
+	if [ ${lnxmin##.} -eq 82 -o ${lnxmin##.} -gt 91 ]
 	then
 		site="http://mgmt/cobbler/repo_mirror/updates-sles12.3-src"
 	fi
@@ -147,7 +147,7 @@ find_linux_rpm-sles12() {
 	;;
     4.4)
 	site="http://mgmt/cobbler/repo_mirror/updates-sles12.2-x86_64"
-	if [ ${lnxmin##.} -gt 80 ]
+	if [ ${lnxmin##.} -eq 82 -o ${lnxmin##.} -gt 91 ]
 	then
 		site="http://mgmt/cobbler/repo_mirror/updates-sles12.3-x86_64"
 	fi
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 03f2ee1..9142105 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -12,7 +12,7 @@ TBD Intel Corporation
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-107         (SLES11 SP4)
          3.12.74-60.64.40    (SLES12 SP1)
-         4.4.74-92.35        (SLES12 SP2)
+         4.4.90-92.45        (SLES12 SP2)
          4.4.92-6.18         (SLES12 SP3)
          vanilla linux 4.6.7 (ZFS only)
        * Client known to build on unpatched kernels:
@@ -25,7 +25,7 @@ TBD Intel Corporation
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-107         (SLES11 SP4)
          3.12.74-60.64.40    (SLES12 SP1)
-         4.4.74-92.35        (SLES12 SP2)
+         4.4.90-92.45        (SLES12 SP2)
          4.4.92-6.18         (SLES12 SP3)
          vanilla linux 4.6.7
        * Recommended e2fsprogs version: 1.42.13.wc4 or newer
diff --git a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config
index fe185c1..51c69db 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.74 Kernel Configuration
+# Linux/x86 4.4.90 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -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="-92.35-default"
+CONFIG_LOCALVERSION="-92.45-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-sles12.target.in b/lustre/kernel_patches/targets/4.4-sles12.target.in
index 37f30cb..64909c7 100644
--- a/lustre/kernel_patches/targets/4.4-sles12.target.in
+++ b/lustre/kernel_patches/targets/4.4-sles12.target.in
@@ -1,14 +1,10 @@
 lnxmaj="4.4"
-lnxmin=".74"
-lnxrel="92.35"
+lnxmin=".90"
+lnxrel="92.45"
 # 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=".1"
-# for some oddly reasons (bug??) -devel and source have different fix
-# so we'll add another one to detect this, make it the same or remove
-# this change they fix the bug
-rpmfix_diff=".1"
 
 # this is the delimeter that goes before the "smp" at the end of the version
 # defaults to empty
@@ -16,7 +12,7 @@ FLAVOR_DELIMITER="-"
 
 KERNEL_SRPM=kernel-source-${lnxmaj}${lnxmin}-${lnxrel}${rpmfix}.src.rpm
 SERIES=4.4-sles12.series
-LDISKFS_SERIES=4.4-sles12sp2.series
+LDISKFS_SERIES=4.4-sles12sp3.series
 VERSION=$lnxmaj
 EXTRA_VERSION="${lnxmin#.}-${lnxrel}_lustre.@VERSION@"
 LUSTRE_VERSION=@VERSION@
diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 5f7cfae..1d72116 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -22,7 +22,7 @@ PATCH SERIES FOR SERVER KERNELS:
 3.0-sles11sp3.series    3.0.101-0.47.71     (SLES11 SP3)
 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.35        (SLES12 SP2)
+4.4-sles12.series       4.4.90-92.45        (SLES12 SP2)
 4.4-sles12sp3.series    4.4.92-6.18         (SLES12 SP3)
 
 See lustre/ChangeLog for supported client kernel versions.