From 89cfa8d89dedc0ad58e835bc9a0210d0ef2a0873 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Wed, 29 Apr 2009 09:45:20 +0000 Subject: [PATCH] Branch b_release_1_6_7 b=19024 Revert the changes. --- lustre/ChangeLog | 6 +----- lustre/kernel_patches/targets/2.6-rhel5.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index c9dc2bf..4a9055a 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -4,7 +4,7 @@ TBD Sun Microsystems, Inc. 2.6.5-7.314 (SLES 9), 2.6.9-67.0.22.EL (RHEL 4), 2.6.16.60-0.37 (SLES 10), - 2.6.18-128.1.6.el5 (RHEL 5), + 2.6.18-92.1.17.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) @@ -37,10 +37,6 @@ TBD Sun Microsystems, Inc. information, please refer to bugzilla 17630. Severity : enhancement -Bugzilla : 19024 -Description: Update kernel to RHEL5.3 2.6.18-128.1.6.el5. - -Severity : enhancement Bugzilla : 19212 Description: Update kernel to SLES10 SP2 2.6.16.60-0.37. diff --git a/lustre/kernel_patches/targets/2.6-rhel5.target.in b/lustre/kernel_patches/targets/2.6-rhel5.target.in index 718864f..660b7a6 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="128.1.6.el5" +lnxrel="92.1.17.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 b309a4a..c0ee550 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -5,7 +5,7 @@ SUPPORTED KERNELS: 2.6-suse-newer SLES9: 2.6.5-7.314 extra patches for SLES9 after SP1 2.6-rhel4 RHEL4: 2.6.9-67.0.22.EL 2.6-sles10 SLES10: 2.6.16.60-0.37 -2.6-rhel5 RHEL5: 2.6.18-128.1.6.el5 +2.6-rhel5 RHEL5: 2.6.18-92.1.17.el5 2.6.18-vanilla kernel.org: 2.6.18.8 2.6.22-vanilla kernel.org: 2.6.22.14 -- 1.8.3.1