From: Bob Glossman <bob.glossman@intel.com>
Date: Thu, 23 Oct 2014 16:35:01 +0000 (-0700)
Subject: LU-5795 kernel: kernel update [SLES11 SP3 3.0.101-0.40]
X-Git-Tag: 2.6.90~33
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=ae97ae80a617782e8ad991cb0b1bb373ede09663

LU-5795 kernel: kernel update [SLES11 SP3 3.0.101-0.40]

Update target and config files for new version

Test-Parameters: mdsdistro=sles11sp3 ossdistro=sles11sp3\
 clientdistro=sles11sp3 mdsfilesystemtype=ldiskfs\
 mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: Iac6e9dc76a6d2bdeb5615bffaeaa5e69652f31ba
Reviewed-on: http://review.whamcloud.com/12401
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index b40baf6..6104fb3 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -4,10 +4,10 @@ TBD Intel Corporation
          for currently supported client and server kernel versions.
        * Server known to build on patched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
-         3.0.101-0.35        (SLES11 SP3)
+         3.0.101-0.40        (SLES11 SP3)
        * Client known to build on unpatched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
-         3.0.101-0.35        (SLES11 SP3)
+         3.0.101-0.40        (SLES11 SP3)
          3.6.10-4.fc18       (FC18)
          3.10                (kernel.org)
        * Recommended e2fsprogs version: 1.42.9.wc1 or newer
diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config
index afd2687..181ec5e 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config
@@ -66,7 +66,7 @@ CONFIG_IRQ_WORK=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-0.35-default"
+CONFIG_LOCALVERSION="-0.40-default"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -3303,7 +3303,7 @@ CONFIG_SENSORS_W83795=m
 CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
-# CONFIG_SENSORS_W83627EHF is not set
+CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_MC13783_ADC=m
 
diff --git a/lustre/kernel_patches/targets/3.0-sles11sp3.target.in b/lustre/kernel_patches/targets/3.0-sles11sp3.target.in
index 43fb869..8a6fd69 100644
--- a/lustre/kernel_patches/targets/3.0-sles11sp3.target.in
+++ b/lustre/kernel_patches/targets/3.0-sles11sp3.target.in
@@ -1,6 +1,6 @@
 lnxmaj="3.0"
 lnxmin=".101"
-lnxrel="0.35"
+lnxrel="0.40"
 # 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 4377832..5e17b49 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -14,6 +14,6 @@ Clients since 2.6.18 DO NOT need any patches.
 
 PATCH SERIES FOR SERVER KERNELS:
 2.6-rhel6.series	2.6.32-431.29.2.el6
-3.0-sles11sp3.series	3.0.101-0.35
+3.0-sles11sp3.series	3.0.101-0.40
 
 See lustre/ChangeLog for supported client kernel versions.