merge b_devel into HEAD, which will become 0.7.3

[fs/lustre-release.git] / lustre / kernel_patches / series / chaos-2.4.18

diff --git a/lustre/kernel_patches/series/chaos b/lustre/kernel_patches/series/chaos-2.4.18
similarity index 82%
rename from lustre/kernel_patches/series/chaos
rename to lustre/kernel_patches/series/chaos-2.4.18
index 00ae7fd..4c32051 100644 (file)
--- a/lustre/kernel_patches/series/chaos
+++ b/lustre/kernel_patches/series/chaos-2.4.18
@@ -2,7 +2,7 @@ dev_read_only.patch
 exports.patch
 kmem_cache_validate.patch
 lustre_version.patch
-vfs_intent-2.4.18-18.patch
+vfs_intent-2.4.18-18-chaos65.patch
 invalidate_show.patch
 iod-rmap-exports.patch
 export-truncate.patch
@@ -15,6 +15,7 @@ ext3-delete_thread-2.4.18.patch
 extN-misc-fixup.patch
 extN-noread.patch
 extN-wantedi.patch
-extN-san.patch
+ext3-san-2.4.20.patch
 extN-2.4.18-ino_sb_fixup.patch
+ext3-map_inode_page_2.4.18.patch
 iopen-2.4.18.patch