From e9534e98ed0e658cc2c4e72848c5892ebdd50645 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Tue, 4 Dec 2012 13:34:35 +0800 Subject: [PATCH] LU-2373 kernel: Kernel update [RHEL 6.3 2.6.32-279.14.1.el6] Update RHEL6.3 kernel to 2.6.32-279.14.1.el6. Signed-off-by: James Simmons Signed-off-by: yangsheng Change-Id: I43a6721663cfab794882f220f7c64a705be20c0f Reviewed-on: http://review.whamcloud.com/3811 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-2.6.32-2.6-rhel6-i686.config | 6 ++++++ .../kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config | 6 ++++++ lustre/kernel_patches/targets/2.6-rhel6.target.in | 2 +- lustre/kernel_patches/which_patch | 4 ++-- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index caf3bb4..15cd228 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2,11 +2,11 @@ * version 2.1.3 * Server support for kernels: 2.6.18-308.20.1.el5 (RHEL5) - 2.6.32-279.2.1.el6 (RHEL6) + 2.6.32-279.14.1.el6 (RHEL6) * Client support for unpatched kernels: (see http://wiki.lustre.org/index.php?title=Patchless_Client) 2.6.18-308.20.1.el5 (RHEL5) - 2.6.32-279.2.1.el6 (RHEL6) + 2.6.32-279.14.1.el6 (RHEL6) 2.6.29.4-167.fc11 (FC11) 2.6.16.60-0.69.1 (SLES10) 2.6.27.19-5 (SLES11) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-i686.config index 5894729..e2b8f5f 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-i686.config @@ -1882,6 +1882,12 @@ CONFIG_AR9170_LEDS=y CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config index f2ee3a8..91ed00f 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config @@ -1804,6 +1804,12 @@ CONFIG_AR9170_LEDS=y CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m diff --git a/lustre/kernel_patches/targets/2.6-rhel6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.target.in index a704800..eaf8b40 100644 --- a/lustre/kernel_patches/targets/2.6-rhel6.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel6.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.32" -lnxrel="279.2.1.el6" +lnxrel="279.14.1.el6" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel6.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 6852eaf..5886457 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -2,10 +2,10 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: 2.6-rhel5 RHEL5: 2.6.18-308.20.1.el5 -2.6-rhel6 RHEL6: 2.6.32-279.2.1.el6 +2.6-rhel6 RHEL6: 2.6.32-279.14.1.el6 CLIENT SUPPORT FOR UNPATCHED KERNELS: 2.6.18-308.20.1.el5 (RHEL5) - 2.6.32-279.2.1.el6 (RHEL6) + 2.6.32-279.14.1.el6 (RHEL6) 2.6.16.60-0.69.1 (SLES10) 2.6.27.19-5 (SLES11) -- 1.8.3.1