- remove dynlocks from kernel patches, update 2.6.18 series with correct patches

diff --git a/lustre/kernel_patches/series/2.6-rhel4.series b/lustre/kernel_patches/series/2.6-rhel4.series
index 7c3c430..c1bbc2f 100644 (file)
--- a/lustre/kernel_patches/series/2.6-rhel4.series
+++ b/lustre/kernel_patches/series/2.6-rhel4.series
@@ -27,8 +27,6 @@ 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
-dynamic-locks-common.patch
-dynamic-locks-2.6.9.patch
 export-nr_free_buffer_pages.patch
 vfs-keep-inode-hashed-for-clear-inode.patch
 modpost_external_module_updates_rhel4.patch

diff --git a/lustre/kernel_patches/series/2.6-sles10.series b/lustre/kernel_patches/series/2.6-sles10.series
index 387008b..0036920 100644 (file)
--- a/lustre/kernel_patches/series/2.6-sles10.series
+++ b/lustre/kernel_patches/series/2.6-sles10.series
@@ -11,7 +11,5 @@ export_symbol_numa-2.6-fc5.patch
 blkdev_tunables-2.6-sles10.patch
 jbd-stats-2.6-sles10.patch
 jbd-journal-chksum-2.6-sles10.patch
-dynamic-locks-common.patch 
-dynamic-locks-2.6.16-sles10.patch 
 proc-sleep-2.6.16-sles10.patch 
 export-nr_free_buffer_pages.patch 

diff --git a/lustre/kernel_patches/series/2.6.18-vanilla.series b/lustre/kernel_patches/series/2.6.18-vanilla.series
index 8dabcf6..9253a3e 100644 (file)
--- a/lustre/kernel_patches/series/2.6.18-vanilla.series
+++ b/lustre/kernel_patches/series/2.6.18-vanilla.series
@@ -9,8 +9,9 @@ dev_read_only-2.6.18-vanilla.patch
 export-2.6.18-vanilla.patch 
 8kstack-2.6.12.patch
 export-show_task-2.6.18-vanilla.patch 
-sd_iostats-2.6-rhel4.patch 
+sd_iostats-2.6-rhel5.patch 
 export_symbol_numa-2.6.18.patch
 jbd-16tb-overflow-fixes.patch
 jbd-check-for-unmapped-buffer.patch
 jbd-stats-2.6-rhel5.patch
+export-nr_free_buffer_pages.patch