LU-8024 kernel: kernel update [SLES12 SP1 3.12.57-60.35]

Update target and kernel_config files for new version

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

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

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index a2769a1..2c0780b 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -9,7 +9,7 @@ TBD Intel Corporation
          3.10.0-327.13.1.el7 (RHEL7.2)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-68          (SLES11 SP4)
          3.10.0-327.13.1.el7 (RHEL7.2)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-68          (SLES11 SP4)

-         3.12.53-60.30       (SLES12 SP1)
+         3.12.57-60.35       (SLES12 SP1)

          vanilla linux 4.2.1 (ZFS only)
        * Client known to build on unpatched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
          vanilla linux 4.2.1 (ZFS only)
        * Client known to build on unpatched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)


@@ -18,7 +18,7 @@ TBD Intel Corporation
          3.10.0-327.13.1.el7 (RHEL7.2)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-68          (SLES11 SP4)
          3.10.0-327.13.1.el7 (RHEL7.2)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-68          (SLES11 SP4)

-         3.12.53-60.30       (SLES12 SP1)
+         3.12.57-60.35       (SLES12 SP1)

          vanilla linux 4.2.1
        * Recommended e2fsprogs version: 1.42.13.wc4 or newer
        * Recommended ZFS / SPL version: 0.6.4.2
          vanilla linux 4.2.1
        * Recommended e2fsprogs version: 1.42.13.wc4 or newer
        * Recommended ZFS / SPL version: 0.6.4.2

diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config
index 9174cb8..f044fec 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
 #
 # Automatically generated file; DO NOT EDIT.

-# Linux/x86 3.12.53 Kernel Configuration
+# Linux/x86 3.12.57 Kernel Configuration

 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
 #
 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_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set

-CONFIG_LOCALVERSION="-60.30-default"
+CONFIG_LOCALVERSION="-60.35-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


@@ -682,6 +682,7 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y

+CONFIG_PCI_HYPERV=m

 
 #
 # PCI host controller drivers
 
 #
 # PCI host controller drivers

diff --git a/lustre/kernel_patches/targets/3.12-sles12.target.in b/lustre/kernel_patches/targets/3.12-sles12.target.in
index 77faa48..ab8d6b7 100644 (file)
--- a/lustre/kernel_patches/targets/3.12-sles12.target.in
+++ b/lustre/kernel_patches/targets/3.12-sles12.target.in
@@ -1,6 +1,6 @@
 lnxmaj="3.12"
 lnxmaj="3.12"

-lnxmin=".53"
-lnxrel="60.30"
+lnxmin=".57"
+lnxrel="60.35"

 # 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 9052be7..eb26492 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -19,6 +19,6 @@ PATCH SERIES FOR SERVER KERNELS:
 3.10-rhel7.series       3.10.0-327.13.1.el7 (RHEL 7.2)
 3.0-sles11sp3.series    3.0.101-0.47.71     (SLES11 SP3)
 3.0-sles11sp3.series    3.0.101-68          (SLES11 SP4)
 3.10-rhel7.series       3.10.0-327.13.1.el7 (RHEL 7.2)
 3.0-sles11sp3.series    3.0.101-0.47.71     (SLES11 SP3)
 3.0-sles11sp3.series    3.0.101-68          (SLES11 SP4)

-3.12-sles12.series      3.12.53-60.30       (SLES12 SP1)
+3.12-sles12.series      3.12.57-60.35       (SLES12 SP1)

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