diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index c2389854d14b7b22c9b680ca95225a3a5753be12..a9892fd1796f684317ac8dc7ed4d276dba8979c1 100644
--- 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.EL (RHEL 4)
+ 2.6.9-55.0.2.EL (RHEL 4)
2.6.16.46-0.14 (SLES 10)
2.6.18.8 vanilla (kernel.org)
* Client support for unpatched kernels:
@@ -95,6 +95,13 @@ Frequency : only with liblustre
Description: Liblustre is not releasing flock locks on file close.
Details : Release flock locks on file close.
+Severity : minor
+Bugzilla : 12839
+Frequency : only for RHEL4
+Description: Update kernel patches for kernel-2.6.9-55.0.2.EL
+Details : Remove inode-nr_unused-2.6.9-rhel4.patch from 2.6-rhel4.series
+ Update target file and kernel config.
+
--------------------------------------------------------------------------------
2007-07-30 Cluster File Systems, Inc. <info@clusterfs.com>
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 ab89ad2709b18d10120847121e122fd607beab21..a01f9344f5f5aea24208a4d89b69c220bc147dad 100644
--- 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 bdd4563190b93a7b66145bef1b6f37e786136ebc..c21e5332ac622d097121ded005be357cc3ad67a9 100644
--- 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 ecc896636534ac20831d62e98fe8055d1d415770..48fcb26f1f7cd061272782d7a9efb8d9581317a8 100644
--- 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 59133ac3c87bb3394b217d31ca2a85592a87cc96..1c056bf83596fd3179b3959519144bc221765360 100644
--- a/lustre/kernel_patches/series/2.6-rhel4-titech.series
+++ b/lustre/kernel_patches/series/2.6-rhel4-titech.series
@@ -28,4 +28,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 632e3521eba22ec55cf913e2dbec519956862b1e..dda2adfa7cdc7889001a073c59ca8ee5fda360a6 100644
--- a/lustre/kernel_patches/series/2.6-rhel4.series
+++ b/lustre/kernel_patches/series/2.6-rhel4.series
@@ -28,4 +28,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/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in
index e744d92776a4cdee5af4e366790c1b7365511f21..68128a0d7cd40d4a4b89458f9b2e6c256da2aaa3 100644
--- 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 fdbf77effcfb129b3a0d64650c0a033732b3c03b..1f90cab12ae7a7a0f675ebdf62293e90e8822dbe 100644
--- 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