From f74512282221d0bcea5a95c911d06015ffe6e5fb Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 20 May 2014 13:30:01 -0700 Subject: [PATCH] LU-5088 kernel: kernel update [SLES11 SP3 3.0.101-0.29] update target and config files for new version Signed-off-by: Bob Glossman Change-Id: I8b3ef29db6f5ae87ed4c681ce9d96e811d5db641 Reviewed-on: http://review.whamcloud.com/10391 Tested-by: Jenkins Reviewed-by: James Simmons Reviewed-by: Minh Diep Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config | 2 +- lustre/kernel_patches/targets/3.0-sles11sp3.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 c8eb457..78d0e3d 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -4,10 +4,10 @@ TBD Intel Corporation for currently supported client and server kernel versions. * Server known to build on patched kernels: 2.6.32-431.17.1.el6 (RHEL6.5) - 3.0.101-0.21 (SLES11 SP3) + 3.0.101-0.29 (SLES11 SP3) * Client known to build on unpatched kernels: 2.6.32-431.17.1.el6 (RHEL6.5) - 3.0.101-0.21 (SLES11 SP3) + 3.0.101-0.29 (SLES11 SP3) 3.6.10-4.fc18 (FC18) 3.10 (kernel.org) * Recommended e2fsprogs version: 1.42.9.wc1 or newer 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 9acd484..d4339ca 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.21-default" +CONFIG_LOCALVERSION="-0.29-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-sles11sp3.target.in b/lustre/kernel_patches/targets/3.0-sles11sp3.target.in index ee48819..9452477 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.21" +lnxrel="0.29" # 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 32a96a7..f18a368 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -14,6 +14,6 @@ Clients since 2.6.18 DO NOT need any patches. PATCH SERIES FOR SERVER KERNELS: 2.6-rhel6.series 2.6.32-431.17.1.el6 -3.0-sles11sp3.series 3.0.101-0.21 +3.0-sles11sp3.series 3.0.101-0.29 See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1