Branch b1_6

Disable journal checksum patch due to release-blocking problems with
quota and other errors (LTS does not support # in the series files).
b=13487
b=13449
r=scjody

diff --git a/lustre/kernel_patches/series/2.6-rhel5.series b/lustre/kernel_patches/series/2.6-rhel5.series
index 688ca34..076164b 100644 (file)
--- a/lustre/kernel_patches/series/2.6-rhel5.series
+++ b/lustre/kernel_patches/series/2.6-rhel5.series
@@ -9,4 +9,3 @@ export-2.6.18-vanilla.patch
 export-show_task-2.6.18-vanilla.patch
 sd_iostats-2.6-rhel4.patch
 export_symbol_numa-2.6-fc5.patch
-#jbd-journal-chksum-2.6.18-vanilla.patch

diff --git a/lustre/kernel_patches/series/2.6-sles10.series b/lustre/kernel_patches/series/2.6-sles10.series
index 406c097..d6ea003 100644 (file)
--- a/lustre/kernel_patches/series/2.6-sles10.series
+++ b/lustre/kernel_patches/series/2.6-sles10.series
@@ -14,4 +14,3 @@ sd_iostats-2.6-rhel4.patch
 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

diff --git a/lustre/kernel_patches/series/2.6.18-vanilla.series b/lustre/kernel_patches/series/2.6.18-vanilla.series
index 574524e..db3efc6 100644 (file)
--- a/lustre/kernel_patches/series/2.6.18-vanilla.series
+++ b/lustre/kernel_patches/series/2.6.18-vanilla.series
@@ -13,4 +13,3 @@ sd_iostats-2.6-rhel4.patch
 export_symbol_numa-2.6.18.patch 
 jbd-16tb-overflow-fixes.patch
 jbd-check-for-unmapped-buffer.patch
-#jbd-journal-chksum-2.6.18-vanilla.patch