From 4ec34a65016ec24f1bbc14921ee692c493fad2af Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 22 Dec 2015 11:32:19 -0800 Subject: [PATCH] LU-7596 kernel: kernel update [SLES11 SP4 3.0.101-68] Update SLES11 SP4 kernel to 3.0.101-68 Test-Parameters: mdsdistro=sles11sp4 ossdistro=sles11sp4 \ clientdistro=sles11sp4 mdsfilesystemtype=ldiskfs \ mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs \ testgroup=review-ldiskfs Signed-off-by: Bob Glossman Change-Id: Ia9c4ddfe29c172a6dc4d85ac99317ecfa1c5cb56 Reviewed-on: http://review.whamcloud.com/17710 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Dmitry Eremin Reviewed-by: Jian Yu Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-3.0-3.0-sles11sp4-x86_64.config | 2 +- lustre/kernel_patches/targets/3.0-sles11sp4.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 b500330..b80180d 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -8,7 +8,7 @@ TBD Intel Corporation 2.6.32-573.8.1.el6 (RHEL6.7) 3.10.0-327.3.1.el7 (RHEL7.2) 3.0.101-0.47.67 (SLES11 SP3) - 3.0.101-65 (SLES11 SP4) + 3.0.101-68 (SLES11 SP4) vanilla linux 4.2.1 (ZFS only) * Client known to build on unpatched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) @@ -16,7 +16,7 @@ TBD Intel Corporation 2.6.32-573.8.1.el6 (RHEL6.7) 3.10.0-327.3.1.el7 (RHEL7.2) 3.0.101-0.47.67 (SLES11 SP3) - 3.0.101-65 (SLES11 SP4) + 3.0.101-68 (SLES11 SP4) 3.12.39-47 (SLES12) vanilla linux 4.2.1 * Recommended e2fsprogs version: 1.42.13.wc4 or newer diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp4-x86_64.config index 6dbf37f..b15cc10 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp4-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp4-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="-65-default" +CONFIG_LOCALVERSION="-68-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.0-sles11sp4.target.in b/lustre/kernel_patches/targets/3.0-sles11sp4.target.in index 2c08de7..b7b16f4 100644 --- a/lustre/kernel_patches/targets/3.0-sles11sp4.target.in +++ b/lustre/kernel_patches/targets/3.0-sles11sp4.target.in @@ -1,6 +1,6 @@ lnxmaj="3.0" lnxmin=".101" -lnxrel="65" +lnxrel="68" # 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 7e64833..7bb1092 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -18,6 +18,6 @@ PATCH SERIES FOR SERVER KERNELS: 2.6-rhel6.series 2.6.32-573.8.1.el6 (RHEL 6.7) 3.10-rhel7.series 3.10.0-327.3.1.el7 (RHEL 7.2) 3.0-sles11sp3.series 3.0.101-0.47.67 (SLES11 SP3) -3.0-sles11sp3.series 3.0.101-65 (SLES11 SP4) +3.0-sles11sp3.series 3.0.101-68 (SLES11 SP4) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1