From: Bob Glossman Date: Wed, 5 Feb 2014 19:04:54 +0000 (-0800) Subject: LU-4589 kernel: kernel update [SLES11 SP3 3.0.101-0.15] X-Git-Tag: 2.5.56~57 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=db1524d44717a5398560413701550ae43aea7175;p=fs%2Flustre-release.git LU-4589 kernel: kernel update [SLES11 SP3 3.0.101-0.15] update target and config files for new kernel version Signed-off-by: Bob Glossman Change-Id: I91a003a5b1947287265b06f16eb5cb9c817d5758 Reviewed-on: http://review.whamcloud.com/9149 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- 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 4d714a6..514050f 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.8-default" +CONFIG_LOCALVERSION="-0.15-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -408,6 +408,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_BOOTMEM_INFO_NODE=y CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTPLUG_SPARSE=y CONFIG_MEMORY_HOTREMOVE=y diff --git a/lustre/kernel_patches/targets/3.0-sles11sp3.target.in b/lustre/kernel_patches/targets/3.0-sles11sp3.target.in index 523a4bc..38c9f81 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.8" +lnxrel="0.15" # 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