Branch b1_6

b=12839

Reverting this commit, as it breaks sles9 builds.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 51bffc7..ca9b9f8 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -2,7 +2,7 @@
        * version 1.6.2
        * Support for kernels:
         2.6.5-7.283 (SLES 9)
-        2.6.9-55.0.2.EL (RHEL 4)
+        2.6.9-55.EL (RHEL 4)
         2.6.16.46-0.14 (SLES 10)
         2.6.18.8 vanilla (kernel.org)
        * Client support for unpatched kernels:
@@ -76,12 +76,6 @@ Description: warnings with build patchless client with vanila 2.6.19 and up
 Details    : change the old ctl_table style and replace ctl_table/ctl_table_header 
             with cfs_sysctl_table_t/cfs_sysctl_table_header_t
 
-Severity   : normal
-Bugzilla   : 12839
-Description: Kernel patches for RHEL4 55.0.2 kernel update
-Details    : Remove inode-nr_unused-2.6.9-rhel4.patch from 2.6-rhel4.series.
-            Update target file and kernel config.
-
 Severity   : major
 Bugzilla   : 13093
 Description: O_DIRECT bypasses client statistics.

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
index a01f934..ab89ad2 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
@@ -63,7 +63,6 @@ CONFIG_STOP_MACHINE=y
 #
 CONFIG_MEM_MIRROR=y
 # CONFIG_X86_PC is not set
-# CONFIG_X86_XEN is not set
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_NUMAQ is not set

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
index c21e533..bdd4563 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
@@ -62,7 +62,6 @@ CONFIG_KMOD=y
 # Processor type and features
 #
 CONFIG_X86_PC=y
-# CONFIG_X86_XEN is not set
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_NUMAQ is not set

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
index 48fcb26..ecc8966 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
@@ -162,7 +162,6 @@ CONFIG_PCI=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 # CONFIG_UNORDERED_IO is not set
-# CONFIG_HOTPLUG_CPU is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_LEGACY_PROC=y
 # CONFIG_PCI_NAMES is not set

diff --git a/lustre/kernel_patches/series/2.6-rhel4-titech.series b/lustre/kernel_patches/series/2.6-rhel4-titech.series
index 1c056bf..59133ac 100644 (file)
--- a/lustre/kernel_patches/series/2.6-rhel4-titech.series
+++ b/lustre/kernel_patches/series/2.6-rhel4-titech.series
@@ -28,3 +28,4 @@ bitops_ext2_find_next_le_bit-2.6.patch
 quota-deadlock-on-pagelock-core.patch
 quota-umount-race-fix.patch
 quota-deadlock-on-pagelock-ext3.patch
+inode-nr_unused-2.6.9-rhel4.patch

diff --git a/lustre/kernel_patches/series/2.6-rhel4.series b/lustre/kernel_patches/series/2.6-rhel4.series
index dda2adf..632e352 100644 (file)
--- a/lustre/kernel_patches/series/2.6-rhel4.series
+++ b/lustre/kernel_patches/series/2.6-rhel4.series
@@ -28,3 +28,4 @@ bitops_ext2_find_next_le_bit-2.6.patch
 quota-deadlock-on-pagelock-core.patch
 quota-umount-race-fix.patch
 quota-deadlock-on-pagelock-ext3.patch
+inode-nr_unused-2.6.9-rhel4.patch

diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in
index 68128a0..e744d92 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel4.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel4.target.in
@@ -1,5 +1,5 @@
 lnxmaj="2.6.9"
-lnxrel="55.0.2.EL"
+lnxrel="55.EL"
 
 KERNEL=linux-${lnxmaj}-${lnxrel}.tar.bz2
 SERIES=2.6-rhel4.series

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 1f90cab..fdbf77e 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -3,7 +3,7 @@ SERIES                VERSION                  COMMENT
 SUPPORTED KERNELS:
 2.6-suse              SLES9 before SP1         already in SLES9 SP1 kernel
 2.6-suse-newer        SLES9: 2.6.5-7.282       extra patches for SLES9 after SP1
-2.6-rhel4             RHEL4: 2.6.9-55.0.2.EL
+2.6-rhel4             RHEL4: 2.6.9-55.EL
 2.6-sles10            SLES10: 2.6.16.46-0.14
 2.6.18-vanilla.series kernel.org: 2.6.18.8