From: johann <johann>
Date: Fri, 14 Sep 2007 16:40:12 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_7_0_51~738
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;ds=sidebyside;h=03365f9fcedcdbdac1b53c7622888e3f22e7365f;p=fs%2Flustre-release.git

Branch b1_6

Remove journal checksum patch from the ldiskfs series.
b=13487
b=13449
r=scjody
---

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series
index fb44f0d..1de2c14 100644
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series
@@ -15,6 +15,5 @@ ext3-nanosecond-2.6.18-vanilla.patch
 ext3-inode-version-2.6.18-vanilla.patch
 ext3-mmp-2.6.18-vanilla.patch
 ext3-unlink-race.patch
-#ext3-journal-chksum-2.6.18-vanilla.patch
 ext3-fiemap-2.6.18-vanilla.patch
 ext3-block-bitmap-validation-2.6-rhel5.patch
diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series
index d7a6a37..50e86e7 100644
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series
@@ -19,6 +19,5 @@ ext3-uninit-2.6-sles10.patch
 ext3-nanosecond-2.6-sles10.patch
 ext3-inode-version-2.6-sles10.patch
 ext3-mmp-2.6-sles10.patch
-#ext3-journal-chksum-2.6.18-vanilla.patch
 ext3-fiemap-2.6-sles10.patch
 ext3-block-bitmap-validation-2.6-SLES10.patch
diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series
index 43e4071..63f2c63 100644
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series
@@ -16,5 +16,4 @@ ext3-nanosecond-2.6.18-vanilla.patch
 ext3-inode-version-2.6.18-vanilla.patch
 ext3-mmp-2.6.18-vanilla.patch
 ext3-handle-directory-corruption-better.patch
-#ext3-journal-chksum-2.6.18-vanilla.patch
 ext3-fiemap-2.6.18-vanilla.patch