From e5d11dc3313cb5f26a5cd1923721bbc64de9bb30 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Fri, 23 Nov 2012 03:15:24 +0800 Subject: [PATCH] LU-2372 kernel: kernel update [RHEL5.8 2.6.18-308.20.1.el5] Update RHEL5.8 kernel to 2.6.18-308.20.1.el5. Signed-off-by: yang sheng Change-Id: Iafb4088227fea098840b70e574f2afe5a1f4067c Reviewed-on: http://review.whamcloud.com/4658 Tested-by: Hudson Reviewed-by: Lai Siyao Tested-by: Maloo Reviewed-by: Johann Lombardi --- lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config | 9 ++++----- .../kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config | 9 ++++----- lustre/kernel_patches/targets/2.6-rhel5.target.in | 2 +- lustre/kernel_patches/which_patch | 4 ++-- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 64d45d5..caf3bb4 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -1,11 +1,11 @@ 27-08-2012 Whamcloud, Inc. * version 2.1.3 * Server support for kernels: - 2.6.18-308.11.1.el5 (RHEL5) + 2.6.18-308.20.1.el5 (RHEL5) 2.6.32-279.2.1.el6 (RHEL6) * Client support for unpatched kernels: (see http://wiki.lustre.org/index.php?title=Patchless_Client) - 2.6.18-308.11.1.el5 (RHEL5) + 2.6.18-308.20.1.el5 (RHEL5) 2.6.32-279.2.1.el6 (RHEL6) 2.6.29.4-167.fc11 (FC11) 2.6.16.60-0.69.1 (SLES10) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config index 757a773..bb5ed8c 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-i686.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Aug 11 21:10:01 2011 +# Fri Nov 23 20:57:12 2012 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -549,6 +549,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m @@ -1149,8 +1150,8 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=m -CONFIG_SD_IOSTATS=y CONFIG_CHR_DEV_ST=m +CONFIG_SD_IOSTATS=y CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y @@ -1231,9 +1232,6 @@ CONFIG_FCOE_FNIC=m # CONFIG_SCSI_FUTURE_DOMAIN is not set CONFIG_SCSI_GDTH=m CONFIG_SCSI_ISCI=m -# CONFIG_PBG_HBA_BETA is not set -CONFIG_PBG_HBA_A2=y -# CONFIG_PBG_HBA_A0 is not set CONFIG_SCSI_IPS=m CONFIG_SCSI_INITIO=m # CONFIG_SCSI_INIA100 is not set @@ -2651,6 +2649,7 @@ CONFIG_USB_STORAGE_ALAUDA=y # USB Input Devices # CONFIG_USB_HID=y +CONFIG_HIDRAW=y CONFIG_USB_HIDINPUT=y CONFIG_USB_HIDINPUT_POWERBOOK=y CONFIG_HID_FF=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config index c1dc325..f49a865 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-prep -# Thu Aug 11 21:03:59 2011 +# Fri Nov 23 20:36:23 2012 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -494,6 +494,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m @@ -1090,8 +1091,8 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=m -CONFIG_SD_IOSTATS=y CONFIG_CHR_DEV_ST=m +CONFIG_SD_IOSTATS=y CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y @@ -1170,9 +1171,6 @@ CONFIG_FCOE_FNIC=m # CONFIG_SCSI_FUTURE_DOMAIN is not set CONFIG_SCSI_GDTH=m CONFIG_SCSI_ISCI=m -# CONFIG_PBG_HBA_BETA is not set -CONFIG_PBG_HBA_A2=y -# CONFIG_PBG_HBA_A0 is not set CONFIG_SCSI_IPS=m CONFIG_SCSI_INITIO=m # CONFIG_SCSI_INIA100 is not set @@ -2554,6 +2552,7 @@ CONFIG_USB_STORAGE_ALAUDA=y # USB Input Devices # CONFIG_USB_HID=y +CONFIG_HIDRAW=y CONFIG_USB_HIDINPUT=y # CONFIG_USB_HIDINPUT_POWERBOOK is not set CONFIG_HID_FF=y diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index a34fff8..4d7672b 100644 --- a/lustre/kernel_patches/targets/2.6-rhel5.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel5.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.18" -lnxrel="308.11.1.el5" +lnxrel="308.20.1.el5" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel5.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index e8dc562..6852eaf 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -1,11 +1,11 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: -2.6-rhel5 RHEL5: 2.6.18-308.11.1.el5 +2.6-rhel5 RHEL5: 2.6.18-308.20.1.el5 2.6-rhel6 RHEL6: 2.6.32-279.2.1.el6 CLIENT SUPPORT FOR UNPATCHED KERNELS: - 2.6.18-308.11.1.el5 (RHEL5) + 2.6.18-308.20.1.el5 (RHEL5) 2.6.32-279.2.1.el6 (RHEL6) 2.6.16.60-0.69.1 (SLES10) 2.6.27.19-5 (SLES11) -- 1.8.3.1