From: Bob Glossman Date: Mon, 24 Jun 2013 18:06:29 +0000 (-0700) Subject: LU-3499 kernel: kernel update [SLES11 SP2 3.0.80-0.5] X-Git-Tag: 2.4.52~16 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=06559083915951ccb15f699bd959c191620a0982;p=fs%2Flustre-release.git LU-3499 kernel: kernel update [SLES11 SP2 3.0.80-0.5] Update of config and build file to new kernel version. Signed-off-by: Bob Glossman Change-Id: I1c65cff0fde98e602b0e50af05091610d20777bd Reviewed-on: http://review.whamcloud.com/6805 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64-default.config b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64-default.config index 94b77f4..24676091 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64-default.config +++ b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64-default.config @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.74 Kernel Configuration +# Linux/x86_64 3.0.80 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -66,7 +66,7 @@ CONFIG_IRQ_WORK=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="-0.6.10-default" +CONFIG_LOCALVERSION="-0.5-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config index 94b77f4..24676091 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.74 Kernel Configuration +# Linux/x86_64 3.0.80 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -66,7 +66,7 @@ CONFIG_IRQ_WORK=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="-0.6.10-default" +CONFIG_LOCALVERSION="-0.5-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-sles11.target.in b/lustre/kernel_patches/targets/3.0-sles11.target.in index 103644f..ec220b9 100644 --- a/lustre/kernel_patches/targets/3.0-sles11.target.in +++ b/lustre/kernel_patches/targets/3.0-sles11.target.in @@ -1,6 +1,6 @@ lnxmaj="3.0" -lnxmin=".74" -lnxrel="0.6.10" +lnxmin=".80" +lnxrel="0.5" # 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