From: ericm <ericm>
Date: Wed, 28 Jan 2004 04:24:11 +0000 (+0000)
Subject: merge from HEAD (20040128)
X-Git-Tag: v1_7_100~1^248~48
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d48639d69bc3b8be7605229f1062cdeed8f33ed8;p=fs%2Flustre-release.git

merge from HEAD (20040128)

there's a lot of confliction in portals/knals/qswnal/qswnal_cb.c, need
Eric Barton check it more.
---

diff --git a/lustre/kernel_patches/series/snapfs-2.4.20 b/lustre/kernel_patches/series/snapfs-2.4.20
index 76d6c11..ce46da4 100644
--- a/lustre/kernel_patches/series/snapfs-2.4.20
+++ b/lustre/kernel_patches/series/snapfs-2.4.20
@@ -46,8 +46,12 @@ ext3-raw-lookup.patch
 ext3-ea-in-inode-2.4.20.patch
 listman-2.4.20.patch
 ext3-trusted_ea-2.4.20.patch
+ext3-extents-2.4.20.patch 
+ext3-extents-in-ea-2.4.20.patch
+ext3-extents-in-ea-ioctl-2.4.20.patch
+ext3-record-extents-ea.patch 
 kernel_text_address-2.4.20-vanilla.patch 
 ext3-xattr-ptr-arith-fix.patch
 gfp_memalloc-2.4.22.patch
-loop_device_get_info.patch
-snapfs_core-2.4.20.patch 
+loop_device_get_info.patch 
+ext3-snapfs-2.4.20.patch