Branch HEAD

b=12839
i=shadow
i=adilger

Remove inode-nr_unused-2.6.9-rhel4.patch from 2.6-rhel4.series.
Update target file & kernel config for RHEL4(2.6.9-55.0.2.EL).

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 25ec2ea..df67224 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,6 +63,7 @@ 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 f967ea2..4d30fb3 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,6 +62,7 @@ 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 c449c4e..2c52eaf 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,6 +162,7 @@ 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 029abb9..d523e6d 100644 (file)
--- a/lustre/kernel_patches/series/2.6-rhel4-titech.series
+++ b/lustre/kernel_patches/series/2.6-rhel4-titech.series
@@ -29,4 +29,3 @@ 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 e1b835a..e725571 100644 (file)
--- a/lustre/kernel_patches/series/2.6-rhel4.series
+++ b/lustre/kernel_patches/series/2.6-rhel4.series
@@ -27,6 +27,5 @@ 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
 dynamic-locks-2.6.9.patch
 export-nr_free_buffer_pages.patch

diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in
index e744d92..68128a0 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.EL"
+lnxrel="55.0.2.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 fdbf77e..1f90cab 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.EL
+2.6-rhel4             RHEL4: 2.6.9-55.0.2.EL
 2.6-sles10            SLES10: 2.6.16.46-0.14
 2.6.18-vanilla.series kernel.org: 2.6.18.8