merged b_devel into b_proto, 20030518

diff --git a/lustre/kernel_patches/pc/dev_read_only_2.4.20.pc b/lustre/kernel_patches/pc/dev_read_only_2.4.20.pc
new file mode 100644 (file)
index 0000000..4760ad1
--- /dev/null
+++ b/lustre/kernel_patches/pc/dev_read_only_2.4.20.pc
@@ -0,0 +1,3 @@
+drivers/block/blkpg.c
+drivers/block/loop.c
+drivers/ide/ide-disk.c

diff --git a/lustre/kernel_patches/series/hp-pnnl-2.4.20 b/lustre/kernel_patches/series/hp-pnnl-2.4.20
index 3dd132f..a74f170 100644 (file)
--- a/lustre/kernel_patches/series/hp-pnnl-2.4.20
+++ b/lustre/kernel_patches/series/hp-pnnl-2.4.20
@@ -16,5 +16,8 @@ ext3-2.4-ino_t.patch
 ext3-largefile.patch
 ext3-truncate_blocks.patch
 ext3-use-after-free.patch
+ext3-orphan_lock.patch
+ext3-delete_thread-2.4.20.patch
+ext3-noread-2.4.20.patch
 extN-wantedi.patch
 ext3-san-2.4.20-hp.patch

diff --git a/lustre/kernel_patches/series/rh-2.4.20 b/lustre/kernel_patches/series/rh-2.4.20
index a1048ef..bc6fe16 100644 (file)
--- a/lustre/kernel_patches/series/rh-2.4.20
+++ b/lustre/kernel_patches/series/rh-2.4.20
@@ -1,3 +1,5 @@
+mcore-2.4.20-8.patch
+dsp.patch
 dev_read_only_2.4.20.patch
 exports_hp_2.4.20.patch
 kmem_cache_validate_2.4.20-rh.patch
@@ -12,6 +14,8 @@ ext-2.4-patch-3.patch
 ext-2.4-patch-4.patch
 linux-2.4.20-xattr-0.8.54-chaos.patch
 ext3-2.4.20-fixes.patch
+ext3_orphan_lock-2.4.20-rh.patch
+ext3-delete_thread-2.4.20.patch
 ext3-noread-2.4.20.patch
 extN-wantedi.patch
-extN-san.patch
+ext3-san-2.4.20-hp.patch