From af9b820d964987368a98327acadc11623a26b656 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Fri, 19 Aug 2016 08:45:55 -0700 Subject: [PATCH] LU-8518 kernel: kernel update [SLES12 SP1 3.12.62-60.62] 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 Change-Id: I3f15d7910e4d356ee696696c3c9af9d9b9d589f2 Reviewed-on: http://review.whamcloud.com/22045 Reviewed-by: Yang Sheng Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-3.12-3.12-sles12-x86_64.config | 6 +++--- lustre/kernel_patches/targets/3.12-sles12.target.in | 6 +++--- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index c835d03c..8acf959 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -10,7 +10,7 @@ TBD Intel Corporation 3.10.0-327.28.3.el7 (RHEL7.2) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-80 (SLES11 SP4) - 3.12.59-60.41 (SLES12 SP1) + 3.12.62-60.62 (SLES12 SP1) vanilla linux 4.5.7 (ZFS only) * Client known to build on unpatched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) @@ -20,7 +20,7 @@ TBD Intel Corporation 3.10.0-327.28.3.el7 (RHEL7.2) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-80 (SLES11 SP4) - 3.12.59-60.41 (SLES12 SP1) + 3.12.62-60.62 (SLES12 SP1) vanilla linux 4.5.7 * Recommended e2fsprogs version: 1.42.13.wc4 or newer * Recommended ZFS / SPL version: 0.6.5.7 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 ab47f0a..c87cad3 100644 --- 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. -# Linux/x86 3.12.59 Kernel Configuration +# Linux/x86 3.12.62 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="-60.41-default" +CONFIG_LOCALVERSION="-60.62-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -1686,7 +1686,7 @@ CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m diff --git a/lustre/kernel_patches/targets/3.12-sles12.target.in b/lustre/kernel_patches/targets/3.12-sles12.target.in index 08c5413..4e8899e 100644 --- a/lustre/kernel_patches/targets/3.12-sles12.target.in +++ b/lustre/kernel_patches/targets/3.12-sles12.target.in @@ -1,10 +1,10 @@ lnxmaj="3.12" -lnxmin=".59" -lnxrel="60.41" +lnxmin=".62" +lnxrel="60.62" # 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=".2" +rpmfix=".1" # this is the delimeter that goes before the "smp" at the end of the version # defaults to empty diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 51aeba4..fa0337eb 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -20,6 +20,6 @@ PATCH SERIES FOR SERVER KERNELS: 3.10-rhel7.series 3.10.0-327.28.3.el7 (RHEL 7.2) 3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) 3.0-sles11sp3.series 3.0.101-80 (SLES11 SP4) -3.12-sles12.series 3.12.59-60.41 (SLES12 SP1) +3.12-sles12.series 3.12.62-60.62 (SLES12 SP1) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1