From 1ea468480e6bee5782d96955a60d5bab1491b080 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Thu, 30 Mar 2017 09:27:47 -0700 Subject: [PATCH] LU-9276 kernel: kernel update [SLES12 SP1 3.12.69-60.64.35] Update target and kernel_config files for new version Test-Parameters: clientdistro=sles12 testgroup=review-ldiskfs \ mdsdistro=sles12 ossdistro=sles12 mdtfilesystemtype=ldiskfs \ ostfilesystemtype=ldiskfs Signed-off-by: Bob Glossman Change-Id: Ied31b0a3601ac6e1db06da3e0167b875d1f2200a Reviewed-on: https://review.whamcloud.com/26286 Reviewed-by: Minh Diep Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-3.12-3.12-sles12-x86_64.config | 2 +- lustre/kernel_patches/targets/3.12-sles12.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index cbd8e5d..90124db 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -11,7 +11,7 @@ TBD Intel Corporation 3.10.0-514.16.1.el7 (RHEL7.3) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-97 (SLES11 SP4) - 3.12.69-60.64.32 (SLES12 SP1) + 3.12.69-60.64.35 (SLES12 SP1) 4.4.49-92.14 (SLES12 SP2) vanilla linux 4.6.7 (ZFS only) * Client known to build on unpatched kernels: @@ -23,7 +23,7 @@ TBD Intel Corporation 3.10.0-514.16.1.el7 (RHEL7.3) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-97 (SLES11 SP4) - 3.12.69-60.64.32 (SLES12 SP1) + 3.12.69-60.64.35 (SLES12 SP1) 4.4.49-92.14 (SLES12 SP2) vanilla linux 4.6.7 * Recommended e2fsprogs version: 1.42.13.wc4 or newer 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 753c11b..ad61a93 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 @@ -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.64.32-default" +CONFIG_LOCALVERSION="-60.64.35-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y diff --git a/lustre/kernel_patches/targets/3.12-sles12.target.in b/lustre/kernel_patches/targets/3.12-sles12.target.in index 15c0772..1e7702f 100644 --- 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" lnxmin=".69" -lnxrel="60.64.32" +lnxrel="60.64.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 diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index c1c3055..58fbdcc 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -21,7 +21,7 @@ PATCH SERIES FOR SERVER KERNELS: 3.10-rhel7.series 3.10.0-514.16.1.el7 (RHEL 7.3) 3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) 3.0-sles11sp3.series 3.0.101-97 (SLES11 SP4) -3.12-sles12.series 3.12.69-60.64.32 (SLES12 SP1) +3.12-sles12.series 3.12.69-60.64.35 (SLES12 SP1) 4.4-sles12.series 4.4.49-92.14 (SLES12 SP2) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1