merge1.sh devel zcfg

Resolved conflicts with Tian Ying's recent checkins.  Also forced to
fix local export cleanup problem by adding an obd_init_export()
method. This is called from class_new_export(), and is for devices to
initialize their export data. Allos local (as opposed to network)
connections to be used and cleaned up correctly. Only
mds_init_export() implemented.

diff --git a/lustre/kernel_patches/pc/uml-2.4.20-fixes-1.pc b/lustre/kernel_patches/pc/uml-2.4.20-fixes-1.pc
deleted file mode 100644 (file)
index 0805d2e..0000000
--- a/lustre/kernel_patches/pc/uml-2.4.20-fixes-1.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-arch/um/link.ld.in
-arch/um/kernel/process.c
-arch/um/kernel/skas/process.c
-arch/um/kernel/skas/syscall_kern.c
-arch/um/kernel/trap_user.c
-arch/um/kernel/tt/syscall_kern.c
-arch/um/kernel/tt/uaccess_user.c
-arch/um/kernel/uaccess_user.c