From ea9c6739315e7667228add03ff59b38bbf38f959 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 24 Mar 2015 12:44:57 -0700 Subject: [PATCH] LU-6396 kernel: kernel update [SLES11 SP3 3.0.101-0.47.52] Update target and config files for new version Test-Parameters: envdefinitions=SANITY_EXCEPT=170\ mdsdistro=sles11sp3 ossdistro=sles11sp3 \ clientdistro=sles11sp3 mdsfilesystemtype=ldiskfs \ mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs \ testgroup=review-ldiskfs Signed-off-by: Bob Glossman Change-Id: I4c8d24e45b0e3fbbc31a188ee416860f54371930 Reviewed-on: http://review.whamcloud.com/14164 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Minh Diep Reviewed-by: James Simmons Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config | 4 ++-- lustre/kernel_patches/targets/3.0-sles11sp3.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 7af10c7..04a9e44 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -5,12 +5,12 @@ TBD Intel Corporation * Server known to build on patched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) 2.6.32-504.12.2.el6 (RHEL6.6) - 3.0.101-0.46 (SLES11 SP3) + 3.0.101-0.47.52 (SLES11 SP3) * Client known to build on unpatched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) 2.6.32-504.12.2.el6 (RHEL6.6) 3.10.0-229.el7 (RHEL7.1) - 3.0.101-0.46 (SLES11 SP3) + 3.0.101-0.47.52 (SLES11 SP3) * Recommended e2fsprogs version: 1.42.9.wc1 or newer * NFS export disabled when stack size < 8192 (32-bit Lustre clients), since the NFSv4 export of Lustre filesystem with 4K stack may cause a 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 e089feb..34e3403 100644 --- 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_LOCALVERSION="-0.46-default" +CONFIG_LOCALVERSION="-0.47.52-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -117,7 +117,7 @@ CONFIG_TREE_RCU=y # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=64 # CONFIG_RCU_FANOUT_EXACT is not set -CONFIG_RCU_FAST_NO_HZ=y +# CONFIG_RCU_FAST_NO_HZ is not set # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y diff --git a/lustre/kernel_patches/targets/3.0-sles11sp3.target.in b/lustre/kernel_patches/targets/3.0-sles11sp3.target.in index 6b56444..e9b7ad3 100644 --- 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" -lnxrel="0.46" +lnxrel="0.47.52" # 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 6d4adcf..6be7afb 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -15,6 +15,6 @@ Clients since 2.6.18 DO NOT need any patches. PATCH SERIES FOR SERVER KERNELS: 2.6-rhel6.series 2.6.32-431.29.2.el6 (RHEL 6.5) 2.6-rhel6.series 2.6.32-504.12.2.el6 (RHEL 6.6) -3.0-sles11sp3.series 3.0.101-0.46 (SLES11 SP3) +3.0-sles11sp3.series 3.0.101-0.47.52 (SLES11 SP3) See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1