From ee695bf0762f5dbcb2ac6d96354f8d01ad764903 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Thu, 16 Aug 2012 11:32:27 +0800 Subject: [PATCH] LU-1754 kernel: Kernel update [RHEL 6.3 2.6.32-279.5.1.el6] Update RHEL6.3 kernel to 2.6.32-279.5.1.el6. Signed-off-by: yang sheng Change-Id: I82ddff59f801fce2335583516470297a4664bedc Reviewed-on: http://review.whamcloud.com/3683 Tested-by: Hudson Reviewed-by: James Simmons Reviewed-by: Bobi Jam Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 8 ++++++-- .../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, 21 insertions(+), 5 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 94a72b2..70fb528 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2,9 +2,9 @@ TBD Whamcloud, Inc. * version 2.3.0 * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix * Server support for kernels: - 2.6.32-279.2.1.el6 (RHEL6) + 2.6.32-279.5.1.el6 (RHEL6) * Client support for unpatched kernels: - 2.6.32-279.2.1.el6 (RHEL6) + 2.6.32-279.5.1.el6 (RHEL6) 2.6.27.19-5 (SLES11) 2.6.18-238.19.1.el5 (RHEL5) 2.6.16.60-0.69.1 (SLES10) @@ -16,6 +16,10 @@ TBD Whamcloud, Inc. the re-exporting nodes to be mounted with "32bitapi" mount option Severity : enhancement +Jira : LU-1754 +Description: Update RHEL6.3 kernel to 2.6.32-279.5.1.el6. + +Severity : enhancement Jira : LU-1477 Description: Update RHEL6.3 kernel to 2.6.32-279.2.1.el6. 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 96b4cd8..30b993c 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 8ce6a10..2822a13 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..a5f55b7 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.5.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 61ba850..9c3acd8 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-238.19.1.el5 -2.6-rhel6 RHEL6: 2.6.32-279.2.1.el6 +2.6-rhel6 RHEL6: 2.6.32-279.5.1.el6 CLIENT SUPPORT FOR UNPATCHED KERNELS: 2.6.18-238.19.1.el5 (RHEL5) - 2.6.32-279.2.1.el6 (RHEL6) + 2.6.32-279.5.1.el6 (RHEL6) 2.6.16.60-0.69.1 (SLES10) 2.6.27.19-5 (SLES11) -- 1.8.3.1