Fixed merge problems
Date: Tue Jun 15 00:32:36 PDT 2004
Workarea: snort.melbourne.sgi.com:/home/ajones/source/2.4.x-xfs
Inspected by: tes, nathans, ivanr
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: xfs-cmds:slinx:173569a
cmd/xfstests/common.rc - 1.34
cmd/xfstests/001 - 1.7
cmd/xfstests/002 - 1.7
cmd/xfstests/003 - 1.7
cmd/xfstests/004 - 1.12
cmd/xfstests/005 - 1.10
cmd/xfstests/006 - 1.7
cmd/xfstests/007 - 1.7
cmd/xfstests/008 - 1.10
cmd/xfstests/009 - 1.12
cmd/xfstests/010 - 1.8
cmd/xfstests/011 - 1.7
cmd/xfstests/012 - 1.7
cmd/xfstests/013 - 1.14
cmd/xfstests/014 - 1.7
cmd/xfstests/015 - 1.12
cmd/xfstests/016 - 1.17
cmd/xfstests/017 - 1.13
cmd/xfstests/018 - 1.29
cmd/xfstests/020 - 1.11
cmd/xfstests/022 - 1.9
cmd/xfstests/023 - 1.8
cmd/xfstests/024 - 1.10
cmd/xfstests/025 - 1.8
cmd/xfstests/026 - 1.7
cmd/xfstests/027 - 1.7
cmd/xfstests/028 - 1.9
cmd/xfstests/029 - 1.13
cmd/xfstests/030 - 1.11
cmd/xfstests/031 - 1.13
cmd/xfstests/032 - 1.11
cmd/xfstests/033 - 1.14
cmd/xfstests/034 - 1.11
cmd/xfstests/035 - 1.8
cmd/xfstests/036 - 1.7
cmd/xfstests/037 - 1.7
cmd/xfstests/038 - 1.7
cmd/xfstests/039 - 1.7
cmd/xfstests/042 - 1.13
cmd/xfstests/043 - 1.8
cmd/xfstests/044 - 1.17
cmd/xfstests/045 - 1.10
cmd/xfstests/046 - 1.7
cmd/xfstests/047 - 1.9
cmd/xfstests/048 - 1.8
cmd/xfstests/049 - 1.13
cmd/xfstests/050 - 1.20
cmd/xfstests/051 - 1.20
cmd/xfstests/052 - 1.11
cmd/xfstests/053 - 1.10
cmd/xfstests/054 - 1.11
cmd/xfstests/055 - 1.7
cmd/xfstests/056 - 1.7
cmd/xfstests/057 - 1.11
cmd/xfstests/058 - 1.9
cmd/xfstests/059 - 1.7
cmd/xfstests/060 - 1.7
cmd/xfstests/061 - 1.8
cmd/xfstests/062 - 1.22
cmd/xfstests/063 - 1.7
cmd/xfstests/064 - 1.9
cmd/xfstests/common.quota - 1.17
cmd/xfstests/configure.in - 1.16
cmd/xfstests/common.filter - 1.10
cmd/xfstests/common.config - 1.40
cmd/xfstests/common.repair - 1.10
cmd/xfstests/Makefile - 1.10
cmd/xfstests/common.attr - 1.8
cmd/xfstests/064.out - 1.3
cmd/xfstests/061.out - 1.4
cmd/xfstests/047.out - 1.7
cmd/xfstests/043.out - 1.6
cmd/xfstests/055.out - 1.7
cmd/xfstests/025.out - 1.6
cmd/xfstests/027.out - 1.6
cmd/xfstests/023.out - 1.6
cmd/xfstests/022.out - 1.8
cmd/xfstests/028.out - 1.7
cmd/xfstests/036.out - 1.6
cmd/xfstests/031.out - 1.3
cmd/xfstests/030.out - 1.6
cmd/xfstests/033.out - 1.4
cmd/xfstests/039.out - 1.7
cmd/xfstests/005.out - 1.3
cmd/xfstests/014.out - 1.2
cmd/xfstests/010.out - 1.2
cmd/xfstests/common - 1.6
cmd/xfstests/src/devzero.c - 1.7
cmd/xfstests/src/acl_test.c - 1.9
cmd/xfstests/src/fault.c - 1.7
cmd/xfstests/src/dbtest.c - 1.5
cmd/xfstests/src/bstat.c - 1.7
cmd/xfstests/src/global.h - 1.7
cmd/xfstests/src/truncfile.c - 1.6
cmd/xfstests/src/fill2.c - 1.8
cmd/xfstests/src/runas.c - 1.6
cmd/xfstests/src/alloc.c - 1.8
cmd/xfstests/src/randholes.c - 1.8
cmd/xfstests/src/holes.c - 1.6
cmd/xfstests/src/lstat64.c - 1.9
cmd/xfstests/src/feature.c - 1.11
cmd/xfstests/src/dirstress.c - 1.5
cmd/xfstests/include/Makefile - 1.6
cmd/xfstests/include/builddefs.in - 1.10
cmd/xfstests/065 - 1.13
cmd/xfstests/066 - 1.12
cmd/xfstests/067 - 1.11
cmd/xfstests/src/fstest.c - 1.4
cmd/xfstests/068 - 1.7
cmd/xfstests/069 - 1.5
cmd/xfstests/common.dbench - 1.5
cmd/xfstests/common.bonnie - 1.7
cmd/xfstests/070 - 1.6
cmd/xfstests/src/xfsctl.c - 1.2
cmd/xfstests/m4/package_gdbmdev.m4 - 1.2
cmd/xfstests/m4/package_utilies.m4 - 1.2
cmd/xfstests/071 - 1.6
cmd/xfstests/071.out - 1.3
cmd/xfstests/072 - 1.6
cmd/xfstests/ltp/iogen.c - 1.2
cmd/xfstests/ltp/growfiles.c - 1.2
cmd/xfstests/ltp/fsx.c - 1.4
cmd/xfstests/ltp/doio.c - 1.2
cmd/xfstests/ltp/Makefile - 1.4
cmd/xfstests/lib/write_log.c - 1.2
cmd/xfstests/lib/tlibio.c - 1.2
cmd/xfstests/include/buildmacros - 1.2
cmd/xfstests/lib/databin.c - 1.2
cmd/xfstests/ltp/fsstress.c - 1.3
cmd/xfstests/073 - 1.4
cmd/xfstests/074.out - 1.3
cmd/xfstests/074 - 1.2
cmd/xfstests/075 - 1.4
cmd/xfstests/076 - 1.2
cmd/xfstests/077 - 1.2
cmd/xfstests/078 - 1.5
cmd/xfstests/079 - 1.2
cmd/xfstests/common.metaperf - 1.2
cmd/xfstests/080 - 1.2
cmd/xfstests/ltp/rwtest.sh - 1.2
cmd/xfstests/082 - 1.5
cmd/xfstests/common.log - 1.6
cmd/xfstests/081 - 1.3
cmd/xfstests/083 - 1.3
cmd/xfstests/084 - 1.2
cmd/xfstests/src/godown.c - 1.2
cmd/xfstests/086 - 1.4
cmd/xfstests/087 - 1.4
cmd/xfstests/088 - 1.2
cmd/xfstests/089 - 1.3
|