From db32b2829f86aaa5124e45d120b900d83a206877 Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Wed, 4 Jun 2008 14:38:10 +0000
Subject: [PATCH] Branch HEAD b=15741 i=johann, zhenyu.xu
Update kernel to RHEL5 kernel-2.6.18-53.1.19.el5.
---
lustre/ChangeLog | 6 +++++-
.../kernel-2.6.18-2.6-rhel5-x86_64-smp.config | 3 +--
.../kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config | 3 +--
lustre/kernel_patches/targets/2.6-rhel5.target.in | 2 +-
lustre/kernel_patches/which_patch | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index e2e84e3da7..57ae3e7c9f 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -2,7 +2,7 @@ tbd Sun Microsystems, Inc.
* version 1.8.0
* Support for kernels:
2.6.16.54-0.2.5 (SLES 10),
- 2.6.18-53.1.14.el5 (RHEL 5),
+ 2.6.18-53.1.19.el5 (RHEL 5),
2.6.22.14 vanilla (kernel.org).
* Client support for unpatched kernels:
(see http://wiki.lustre.org/index.php?title=Patchless_Client)
@@ -12,6 +12,10 @@ tbd Sun Microsystems, Inc.
* RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
removed cwd "./" (refer to Bugzilla 14399).
+Severity : enhancement
+Bugzilla : 15741
+Description: Update to RHEL5 kernel-2.6.18-53.1.19.el5.
+
Severity : major
Bugzilla : 14134
Description: enable MGS and MDT services start separately
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config
index be86ee86a7..c23f1764f0 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.18-prep
-# Sat Nov 24 07:53:07 2007
+# Wed Jun 4 07:25:06 2008
#
CONFIG_X86_64=y
CONFIG_64BIT=y
@@ -2939,7 +2939,6 @@ CONFIG_CRC32=y
CONFIG_LIBCRC32C=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
-CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_TEXTSEARCH=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 99b4df7fe4..ba22c5e070 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
-# Sat Nov 24 07:56:00 2007
+# Wed Jun 4 07:34:21 2008
#
CONFIG_X86_64=y
CONFIG_64BIT=y
@@ -2923,7 +2923,6 @@ CONFIG_CRC32=y
CONFIG_LIBCRC32C=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
-CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_TEXTSEARCH=y
diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in
index 90df0f9445..bca6ca7278 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="53.1.14.el5"
+lnxrel="53.1.19.el5"
KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
SERIES=2.6-rhel5.series
diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 98ea83c20d..7d77decb98 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -3,7 +3,7 @@ SERIES VERSION COMMENT
SUPPORTED KERNELS:
2.6-rhel4 RHEL4: 2.6.9-67.0.7.EL
2.6-sles10 SLES10: 2.6.16.54-0.2.5
-2.6-rhel5 RHEL5: 2.6.18-53.1.14.el5
+2.6-rhel5 RHEL5: 2.6.18-53.1.19.el5
2.6.18-vanilla kernel.org: 2.6.18.8
2.6.22-vanilla kernel.org: 2.6.22.14
--
GitLab