LU-5175 kernel: kernel update [SLES11 SP3 3.0.101-0.31]

update target and config files for new version

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: Ie476fd2493c1eedb6f6c7619e0c4b07fd562fe23
Reviewed-on: http://review.whamcloud.com/10687
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 78d0e3d..045741c 100644 (file)
--- 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.17.1.el6 (RHEL6.5)
          for currently supported client and server kernel versions.
        * Server known to build on patched kernels:
          2.6.32-431.17.1.el6 (RHEL6.5)

-         3.0.101-0.29        (SLES11 SP3)
+         3.0.101-0.31        (SLES11 SP3)

        * Client known to build on unpatched kernels:
          2.6.32-431.17.1.el6 (RHEL6.5)
        * Client known to build on unpatched kernels:
          2.6.32-431.17.1.el6 (RHEL6.5)

-         3.0.101-0.29        (SLES11 SP3)
+         3.0.101-0.31        (SLES11 SP3)

          3.6.10-4.fc18       (FC18)
          3.10                (kernel.org)
        * Recommended e2fsprogs version: 1.42.9.wc1 or newer
          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 d4339ca..a2d04ec 100644 (file)
--- 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_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""

-CONFIG_LOCALVERSION="-0.29-default"
+CONFIG_LOCALVERSION="-0.31-default"

 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y

diff --git a/lustre/kernel_patches/targets/3.0-sles11sp3.target.in b/lustre/kernel_patches/targets/3.0-sles11sp3.target.in
index 9452477..c3f313d 100644 (file)
--- 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"
 lnxmaj="3.0"
 lnxmin=".101"

-lnxrel="0.29"
+lnxrel="0.31"

 # 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
 # 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 f18a368..b03ae74 100644 (file)
--- 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.17.1.el6
 
 PATCH SERIES FOR SERVER KERNELS:
 2.6-rhel6.series       2.6.32-431.17.1.el6

-3.0-sles11sp3.series   3.0.101-0.29
+3.0-sles11sp3.series   3.0.101-0.31

 
 See lustre/ChangeLog for supported client kernel versions.
 
 See lustre/ChangeLog for supported client kernel versions.