From f1187ab9958e9dc030d827db9ec9f8a1658522fe Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Fri, 3 Aug 2007 06:52:23 +0000
Subject: [PATCH] Branch b1_6 b=12839 i=shadow i=adilger
Remove inode-nr_unused-2.6.9-rhel4.patch from 2.6-rhel4.series. It was
include in kernel-2.6.9-55.0.2.EL. Update target & kernel config.
---
lustre/ChangeLog | 9 ++++++++-
.../kernel-2.6.9-2.6-rhel4-i686-smp.config | 1 +
.../kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config | 1 +
.../kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config | 1 +
lustre/kernel_patches/series/2.6-rhel4-titech.series | 1 -
lustre/kernel_patches/series/2.6-rhel4.series | 1 -
lustre/kernel_patches/targets/2.6-rhel4.target.in | 2 +-
lustre/kernel_patches/which_patch | 2 +-
8 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index c2389854d1..a9892fd179 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 ab89ad2709..a01f9344f5 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 bdd4563190..c21e5332ac 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 ecc8966365..48fcb26f1f 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 59133ac3c8..1c056bf835 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 632e3521eb..dda2adfa7c 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 e744d92776..68128a0d7c 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 fdbf77effc..1f90cab12a 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
--
GitLab