From 3480bb04a0e4697880e7644a4e51f84ea7f7cdbe Mon Sep 17 00:00:00 2001 From: yangsheng Date: Sat, 19 Jan 2013 04:24:32 +0800 Subject: [PATCH] LU-2601 kernel: kernel update [RHEL5.9 2.6.18-348.1.1.el5] Update RHEL5.9 kernel to 2.6.18-348.1.1.el5 Signed-off-by: yang sheng Change-Id: I62442e898774aa1513f3496e3e5701b7ec4c2833 Reviewed-on: http://review.whamcloud.com/5132 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Johann Lombardi --- lustre/ChangeLog | 2 +- .../kernel-2.6.18-2.6-rhel5-i686.config | 18 ++++++++++++++++-- .../kernel-2.6.18-2.6-rhel5-x86_64.config | 20 ++++++++++++++++++-- lustre/kernel_patches/targets/2.6-rhel5.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 0341f93..857c450e 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -1,7 +1,7 @@ 2012-xx-xx Whamcloud, Inc. * version 1.8.9-wc1 * Support for kernels: - 2.6.18-308.11.1.el5 (RHEL 5) + 2.6.18-348.1.1.el5 (RHEL 5) 2.6.32-279.19.1.el6 (RHEL 6) - patchless client only * Recommended e2fsprogs version: 1.41.90.wc4 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 0c8623f..2868c57 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 -# Sun Mar 18 11:07:00 2012 +# Fri Jan 11 02:03:36 2013 # 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 @@ -700,6 +701,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m # CONFIG_RDS_DEBUG is not set # @@ -1182,6 +1185,7 @@ CONFIG_SCSI_SAS_ATA=y # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_HYPERV_STORAGE=m CONFIG_LIBFCOE=m CONFIG_FCOE=m CONFIG_LIBISCSI1=m @@ -1553,6 +1557,7 @@ CONFIG_BE2NET=m CONFIG_BNA=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y # # Token Ring devices @@ -1737,6 +1742,7 @@ CONFIG_NETPOLL=y CONFIG_NETPOLL_TRAP=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_VIRTIO_NET=m +CONFIG_HYPERV_NET=m # # ISDN subsystem @@ -1990,7 +1996,7 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_NR_UARTS=64 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y @@ -2933,6 +2939,14 @@ CONFIG_INTEL_IOATDMA_V3=m CONFIG_UIO=m # +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_HID_BASE_HV=m +CONFIG_HID_HYPERV_MOUSE=m + +# # File systems # CONFIG_EXT2_FS=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 af6128a..ff42d38 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 -# Sun Mar 18 11:05:23 2012 +# Fri Jan 11 01:54:54 2013 # 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 @@ -645,6 +646,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m # CONFIG_RDS_DEBUG is not set # @@ -1123,6 +1126,7 @@ CONFIG_SCSI_SAS_ATA=y # SCSI low-level drivers # CONFIG_LIBFC=m +CONFIG_HYPERV_STORAGE=m CONFIG_LIBFCOE=m CONFIG_FCOE=m CONFIG_LIBISCSI1=m @@ -1487,6 +1491,7 @@ CONFIG_BE2NET=m CONFIG_BNA=m CONFIG_SFC=m CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y # # Token Ring devices @@ -1665,6 +1670,7 @@ CONFIG_NETPOLL=y CONFIG_NETPOLL_TRAP=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_VIRTIO_NET=m +CONFIG_HYPERV_NET=m # # ISDN subsystem @@ -1911,7 +1917,7 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_NR_UARTS=64 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y @@ -2741,6 +2747,7 @@ CONFIG_INFINIBAND_CXGB3=m CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_NES=m # CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_INFINIBAND_QIB=m CONFIG_MLX4_INFINIBAND=m CONFIG_INFINIBAND_IPOIB=m CONFIG_INFINIBAND_IPOIB_CM=y @@ -2836,6 +2843,14 @@ CONFIG_INTEL_IOATDMA_V3=m CONFIG_UIO=m # +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_HID_BASE_HV=m +CONFIG_HID_HYPERV_MOUSE=m + +# # Firmware Drivers # CONFIG_EDD=m @@ -3082,6 +3097,7 @@ CONFIG_OPROFILE=m CONFIG_HAVE_OPTPROBES=y CONFIG_KPROBES=y CONFIG_OPTPROBES=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y # # Kernel hacking diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index 33551ea..61b8562 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="348.1.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 c665e56..c1d9c7e 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -1,7 +1,7 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: -2.6-rhel5 RHEL5: 2.6.18-308.11.1.el5 +2.6-rhel5 RHEL5: 2.6.18-348.1.1.el5 CLIENT SUPPORT FOR UNPATCHED KERNELS: kernel.org 2.6.16-2.6.32 -- 1.8.3.1