merge b_devel into HEAD, which will become 0.7.3

[fs/lustre-release.git] / lustre / kernel_patches / series / hp-pnnl-2.4.20

diff --git a/lustre/kernel_patches/series/hp-pnnl-2.4.20 b/lustre/kernel_patches/series/hp-pnnl-2.4.20
index b951209..c2cc2fa 100644 (file)
--- a/lustre/kernel_patches/series/hp-pnnl-2.4.20
+++ b/lustre/kernel_patches/series/hp-pnnl-2.4.20
@@ -2,7 +2,7 @@ dev_read_only_hp_2.4.20.patch
 exports_2.4.20-rh-hp.patch
 kmem_cache_validate_hp.patch
 lustre_version.patch
-vfs_intent-2.4.20-vanilla.patch
+vfs_intent-2.4.20-hp.patch
 invalidate_show.patch
 export-truncate.patch
 iod-stock-24-exports_hp.patch
@@ -21,5 +21,7 @@ ext3-delete_thread-2.4.20.patch
 ext3-noread-2.4.20.patch
 extN-wantedi.patch
 ext3-san-2.4.20.patch
+ext3-map_inode_page.patch
+ext3-error-export.patch
 iopen-2.4.20.patch
 tcp-zero-copy.patch