+++ /dev/null
-.Xrefs
-.Xrefs-2.5
-aclocal.m4
-config.log
-config.status
-config.cache
-config.guess
-config.sub
-configure
-Makefile
-autoMakefile
-autoMakefile.in
-.deps
-tags
-TAGS
-lustre*.tar.gz
-cscope.*
-ID
-autom4te-2.53.cache
-autom4te.cache
-depcomp
-compile
-.*.cmd
-.mergeinfo-*
-Rules
-missing
-mkinstalldirs
-install-sh
-.depend
-.tmp_versions
-config.h
-config.h.in
-Module.markers
-Module.symvers
-Module.symvers.old
-Modules.symvers
-modules.order
-modules-deb
-stamp-h1
-INSTALL
-.pc
-patches
-series
-lustre.spec
-acl.size
-.git
-doxygen.*
+++ /dev/null
-.*.cmd
-.*.flags
-.*.d
-*.ko
-*.c
-.*.o.d
-.tmp_versions
-Rules
-autoMakefile.in
-autoMakefile
-modules.order
-Module.markers
-lustre.spec
-Module.symvers
-Modules.symvers
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-# This file is sourced by lustre/lustrecvs
-
-portalstag=""
-lnettag="b1_x"
-libsysiotag="HEAD"
-snmptag="HEAD"
-ldiskfstag="HEAD"
-ldiskfstag_head="HEAD"
-lustreiokittag="HEAD"
-libcfstag="b1_x"
-dmutag="" # uDMU
-spltag=""
-zfstag=""
-hg_base_url="http://www.wizy.org/mercurial"
-git_base_url="git@git.lustre.org:%s.git"
-
-export LC_COLLATE=C
-
-case "$lustretag" in
- '')
- warn "a lustretag is required."
- usage >&2
- exit 1
- ;;
- --help | -h)
- usage
- exit 0
- ;;
-
- # this is the branch table
- # keep this list sorted alphabetically!
-
- # Note these are "specials" -- branches using lnet b1_x don't need an
- # entry here.
-
- b1_2)
- portalstag="b1_2"
- lnettag=""
- libsysiotag=""
- snmptag=""
- ;;
-
- b1_4_atime_update)
- portalstag="b_hd_newconfig"
- ;;
-
- b1_4_join)
- portalstag="b_hd_newconfig"
- ;;
-
- b1_4_lfs_df)
- portalstag="b_hd_newconfig"
- ;;
-
- b1_4_lov_lvb_cleanup)
- portalstag="b_hd_newconfig"
- ;;
-
- b1_4_next_recovery_transno)
- portalstag="b_hd_newconfig"
- ;;
-
- b_cmd_cray)
- lnettag="HEAD"
- libcfstag="HEAD"
- ;;
-
- b_cmd*)
- portalstag="$lustretag"
- ;;
-
- b_iam*)
- portalstag="b_hd_newconfig"
- # XXX temorary tag until b_iam* is updated from b1_4 liblustre
- libsysiotag="HEAD_RELEASE_1_4_6_LAND_PARENT_20060223_1455"
- ;;
-
- b_ioprovement)
- portalstag="b_ioprovement"
- ;;
-
- b_mpilnd)
- # lnet mpilnd development branch
- lnettag="b_mpilnd"
- lustretag="HEAD"
- ;;
-
- b_new_cmd)
- portalstag="b_new_portals"
- # lnettag="b_lnet_tmp"
- ;;
-
- b_newconfig_rdmarouting)
- portalstag="b_hd_newconfig"
- lnettag="b_newconfig_rdmarouting"
- lustretag="b1_4"
- ;;
-
- b_port_ahead)
- portalstag="b_port_ahead"
- ;;
-
- b_port_netid)
- portalstag="b_port_netid"
- ;;
-
- # b_port_step is only for portals
- b_port_step)
- portalstag="b_port_step"
- lustretag="HEAD"
- ;;
-
- b_port_test)
- portalstag="b_port_test"
- ;;
-
- b_ptlrpc_cleanup)
- portalstag="b_ptlrpc_cleanup"
- ;;
-
- b_ptl_smallfix)
- portalstag="b_ptl_smallfix"
- lustretag="b1_4"
- ;;
-
- # before 1_4_6, we didn't have lnet or snmp
- b_release_1_2_*|b_release_1_4_[0-5])
- portalstag="$lustretag"
- lnettag=""
- libsysiotag="$lustretag"
- snmptag=""
- ;;
-
- b_release_1_4_6)
- portalstag="$lustretag"
- lnettag="$lustretag"
- libsysiotag="$lustretag"
- snmptag="$lustretag"
- ;;
-
- b_release_1_4_6-patchless)
- portalstag=b_release_1_4_6
- lnettag=b_release_1_4_6-patchless
- libsysiotag=b_release_1_4_6
- snmptag=b_release_1_4_6
- ;;
-
- # all later b_release_* tags
- b_release_*)
- lnettag="$lustretag"
- libsysiotag="$lustretag"
- snmptag="$lustretag"
- ldiskfstag="$lustretag"
- ;;
-
- b_self_test)
- # lnet self test development branch
- lnettag="b_self_test"
- lustretag="HEAD"
- ;;
-
- b_usocklnd)
- # lnet usocklnd development branch
- lnettag="b_usocklnd"
- lustretag="b1_6_usocklnd"
- ;;
-
- b_uo2iblnd)
- # lnet u-o2iblnd development branch
- lnettag="b_uo2iblnd"
- lustretag="HEAD"
- ;;
-
- b_hd_smp)
- # LNet grained locking and SMP improvement branch
- libcfstag="b_hd_libcfs_smp"
- lnettag="b_hd_lnet_smp"
- ldiskfstag="$ldiskfstag_head"
- lustretag="b_hd_lustre_smp"
- ;;
-
- b_hd_md_perf)
- # LNet branch for new o2iblnd protocol (15983, 13621, 14425, 14358)
- lnettag="HD_LNET_SMP_BASE"
- ldiskfstag="$ldiskfstag_head"
- lustretag="HD_LUSTRE_SMP_BASE"
- libcfstag="HD_LIBCFS_SMP_BASE"
- ;;
-
- b_ula)
- # lnet "User Level Access" development branch
- lnettag="b_ula"
- lustretag="HEAD"
- ldiskfstag="$ldiskfstag_head"
- ;;
-
- # CMD3
- b_post_cmd3|b_new_cmd_sles10|b1_6_head_sync|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_interop_server)
- # Update b1_8 above when changing this.
- ldiskfstag="$ldiskfstag_head"
- ;;
-
- #umds cleanup
- b_hd_umds_cln2)
- ldiskfstag="b1_8_iam_dynlock"
- ;;
-
- # uOSS
- b_hd_dmu)
- lnettag="b_uoss"
- ldiskfstag="$ldiskfstag_head"
- dmutag="zfs-lustre"
- ;;
-
- # read-only cache for oss
- b_hd_rocache_oss)
- lnettag="HEAD"
- ldiskfstag="b1_8_iam"
- libcfstag="HEAD"
- ;;
-
- # vector read/write
- b_hd_readx)
- lnettag="HEAD"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="HEAD"
- ;;
-
- # params_tree
- b_hd_params_tree)
- lnettag="b_hd_params_tree"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="b_hd_params_tree"
- lustretag="b_hd_params_tree"
- ;;
-
- # Network request scheduler
- b_hd_nrs)
- lnettag="HEAD"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="HEAD"
- ;;
-
- # uMDS
- b_dmu_umds)
- lnettag="b_uoss_umds"
- ldiskfstag="$ldiskfstag_head"
- dmutag="zfs-lustre"
- ;;
-
- # uOSS o2iblnd
- b_uoss_o2iblnd)
- lnettag="b_uoss_o2iblnd"
- lustretag="b_hd_dmu"
- ldiskfstag="$ldiskfstag_head"
- dmutag="zfs-lustre"
- ;;
-
- # client io stack cleanup
- b_client_io_layering)
- lnettag="HEAD"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="HEAD"
- ;;
-
- # HEAD cmd fixes
- b_head_cmd)
- lnettag="HEAD"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="HEAD"
- ;;
-
- # windows client porting (lustre: b_client_io_layering, lnet: HEAD)
- b_winnt_port)
- ldiskfstag="$ldiskfstag_head"
- lnettag="b_winnt_port"
- libcfstag="b_winnt_port"
- ;;
-
- # v1.0-v1.3, v1.4.0-v1.4.2
- v1_[0-3]_*|v1_4_[0-2]|v1_4_[0-2]_*)
- portalstag="$lustretag"
- lnettag=""
- libsysiotag="$lustretag"
- snmptag=""
- ;;
-
- # v1.4.3-v1.4.5, v1.4.5.1 - v1.4.5.9
- v1_4_[3-5]|v1_4_[3-4]_*|v1_4_5_[1-9]|cray_2005*)
- portalstag="$lustretag"
- lnettag=""
- libsysiotag="$lustretag"
- snmptag="$lustretag"
- ;;
-
- # v1.4.6, v1.4.6.[1-91]
- v1_4_6_[1-9]|v1_4_6_9[01])
- portalstag="$lustretag"
- lnettag=""
- libsysiotag="$lustretag"
- snmptag="$lustretag"
- ;;
-
- # Interoperability server side changes
- b_head_interop_disk)
- lnettag="HEAD"
- ldiskfstag="b_ldiskfs_interop_server"
- libcfstag="HEAD"
- ;;
-
- # libcfs name normalization changes
- b_hd_nn)
- libcfstag="b_hd_libcfs_nn"
- lnettag="b_hd_lnet_nn"
- ldiskfstag="$ldiskfstag_head"
- lustretag="b_hd_lustre_nn"
- ;;
-
- # Branches that have been updated to include
- # the libcfs split should be added here
- HEAD|b_head_capa|b_hd_cfld|b_hd_changelog|b_hd_sptlrpc|HD_SPTLRPC_BASE|b_som|b_hd_recov|b_hd_transapi)
- lnettag="HEAD"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="HEAD"
- ;;
-
- b_hd_kdmu)
- # Identical to HEAD + spl and zfs
- lnettag="HEAD"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="HEAD"
- spltag="pre-alpha"
- zfstag="patched"
- ;;
- b_kdmu_params)
- # Identical to HEAD + spl and zfs
- lnettag="b_hd_params_tree"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="b_hd_params_tree"
- lustretag="b_kdmu_params"
- spltag="pre-alpha"
- zfstag="patched"
- ;;
-
- b_head_libcfs)
- lnettag="b_head_libcfs"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="b_head_libcfs"
- ;;
-
- b_head_procfs)
- lnettag="HEAD"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="b_head_procfs"
- ;;
-
- b2_0-bld*)
- lnettag="$lustretag"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="$lustretag"
- ;;
-
- # all later v* tags
- v[1-9]*)
- lnettag="$lustretag"
- libsysiotag="$lustretag"
- snmptag="$lustretag"
- ldiskfstag="$lustretag"
- libcfstag="$lustretag"
- ;;
-
- b_HEAD_*|b_head_*|b_hd_*)
- lnettag="HEAD"
- ldiskfstag="$ldiskfstag_head"
- libcfstag="HEAD"
- ;;
-esac
-
-cvs_cmd libsysio libsysio "$libsysiotag"
-cvs_cmd portals portals "$portalstag"
-cvs_cmd lnet lnet "$lnettag"
-cvs_cmd snmp lustre-snmp "$snmptag"
-cvs_cmd lustre lustre-core "$lustretag"
-cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
-cvs_cmd lustre-iokit lustre-iokit "$lustreiokittag"
-hg_cmd lustre/zfs-lustre "$hg_base_url" "$dmutag"
-cvs_cmd libcfs libcfs "$libcfstag"
-git_cmd spl spl "$spltag" "$git_base_url"
-git_cmd zfs zfs-tmp "$zfstag" "$git_base_url"
-
-[ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build
+++ /dev/null
-#!/usr/bin/env perl
-
-my $mode = "NONE";
-my @modified, @added, @removed;
-
-while($line = <>) {
- if ($line =~ /Modified Files:/) {
- $mode = "MODIFIED";
- next;
- }
-
- if ($line =~ /Added Files:/) {
- $mode = "ADDED";
- next;
- }
-
- if ($line =~ /Removed Files:/) {
- $mode = "REMOVED";
- next;
- }
-
- if ($mode eq "NONE") { next; }
- if ($line =~ /-------/) { next; }
-
- chop($line);
- $line =~ s/^CVS:\s+//;
- $line =~ s/\s+$//;
- # print "processing $line for $mode\n";
- @files = split(/ /, $line);
- # print "new files for $mode: ", join(', ', @files), "\n";
-
- if ($mode eq "MODIFIED") {
- push(@modified, @files);
- } elsif ($mode eq "ADDED") {
- push(@added, @files);
- } elsif ($mode eq "REMOVED") {
- push(@removed, @files);
- } else {
- die "Unknown mode $mode!";
- }
-}
-
-print join(' ', @modified);
-if ($ENV{"SHOW_ALL_FILES"} ne "no") {
- print ' ', join(' ', @added), ' ', join(' ', @removed);
-}
-print "\n";
+++ /dev/null
-#!/bin/bash
-# Put this script and cvs-modified-files.pl into your PATH (~bin is good) and
-#
-# export CVSEDITOR=cvsdiffclient
-#
-# in your .bashrc and you will get a nice bunch of CVS commit reminders:
-# <merge/land tag information>
-# b=<bug_number>
-# i=<inspected_by>
-# i=<inspected_by>
-#
-# Remember to remove the leading "CVS: " part of the comment before saving
-# your commit comment if you want those entries to be saved.
-
-[ -f .mergeinfo ] && . ./.mergeinfo
-
-CVS_MODIFIED_FILES_PL=$(which cvs-modified-files.pl 2>/dev/null)
-if [ -z "$CVS_MODIFIED_FILES_PL" ]; then
- CVS_MODIFIED_FILES_PL=$(dirname $0)/cvs-modified-files.pl
-fi
-FILES=$($CVS_MODIFIED_FILES_PL $1)
-TMP=`mktemp /tmp/cvslog-XXXXXXXX`
-if [ -f $TMP ]; then
- cat - >> $TMP <<- EOH
- CVS: did you test your fix properly (acc-sm.sh, or as needed)?
- CVS: did you update the ChangeLog for a bug fix?
- CVS: did you verify/update affected user documentation?
- CVS: Remove "CVS:" from lines below to include in commit message
- EOH
- [ -f .mergeinfo ] && . .mergeinfo
- [ -z "$PARENT" -a -f lustre/.mergeinfo ] && . lustre/.mergeinfo
- if [ "$PARENT" ]; then
- [ "$OPERATION" ] || OPERATION=Update
- [ "$OPERWHERE" ] || OPERWHERE=from
- echo "CVS: $OPERATION $child $OPERWHERE $parent ($date)" >> $TMP
- else
- [ -r CVS/Tag ] && TAG=CVS/Tag
- [ -z "$TAG" -a -r lustre/CVS/Tag ] && TAG=lustre/CVS/Tag
- [ "$TAG" ] && BRANCH="`sed 's/^T//' $TAG`" || BRANCH="HEAD"
- echo "CVS: Branch $BRANCH" >> $TMP
- fi
- # We can't just put these into the commit template without the leading
- # "CVS: ", otherwise exiting the commend edit would still leave a valid
- # comment in the file and the commit will still be done. We need to
- # make a file without valid comments to allow the commit to be aborted.
- cat - >> $TMP <<- EOB
- CVS: b=<bug>
- CVS: i=<inspected_by>
- CVS: i=<inspected_by>
- EOB
-
- cat $1 >> $TMP
- cp $TMP $1
- rm $TMP
-fi
-
-if [ "${FILES:+have_files}"x = have_filesx ]; then
- echo Diffing $1 : $FILES
- cvs diff -wbBup $FILES 2>/dev/null | sed "s/^/CVS: /" >>$1
-fi
-#gnuclient $1 || vi $1
-[ "$EDITOR" ] || EDITOR=vi
-
-$EDITOR $1
+++ /dev/null
-cvs -qz3
-diff -Nup
-checkout -P
-update -dP
-remove -f
+++ /dev/null
-#!/bin/bash -e
-
-progname=${0##*/}
-
-CONFLICTS=cvs-merge-conflicts
-CVS=cvs
-
-if [ -f .mergeinfo ] ; then
- echo ".mergeinfo exists - clean up first"
- exit
-fi
-
-if [ -f $CONFLICTS ] ; then
- echo "$CONFLICTS exists - clean up first"
- exit
-fi
-
-if [ $# -lt 2 -o $# -gt 3 ]; then
- echo "This is phase 1 of merging branches. Usage: $0 parent child [dir]"
- exit
-fi
-
-parent=$1
-PARENT=`echo $parent | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
-child=$2
-CHILD=`echo $child | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
-date=`date +%Y%m%d_%H%M`
-
-dir=${3:-.}
-module=$(basename $(<$dir/CVS/Repository))
-
-if [ "$module" = "lustre" ] ; then
- echo >&2 "${progname}: You probably want to land lustre or lnet, not the whole tree."
- echo >&2 "${progname}: Try using ${0} $parent $child lustre"
- exit 1
-fi
-
-case $parent in
- HEAD) : ;;
- b_*|b[1-4]*) : ;;
- *) parent="b_$parent" ;;
-esac
-case $child in
- HEAD) : ;;
- b_*|b[1-4]*) : ;;
- *) child="b_$child"
-esac
-
-if [ "$parent" != "HEAD" -a "`cat $dir/CVS/Tag 2> /dev/null`" != "T$parent" ]; then
- echo "${progname}: this script must be run within the $parent branch"
- exit 1
-fi
-
-TEST_FILE=${TEST_FILE:-ChangeLog} # does this need to be smarter?
-check_tag() {
- [ -z "$1" ] && echo "check_tag() missing arg" && exit3
- [ "$1" = "HEAD" ] && return
- $CVS log ${dir%%/*}/$TEST_FILE 2> /dev/null | grep -q " $1: " && return
- echo "${progname}: tag $1 not found in $dir/$TEST_FILE"
- exit 2
-}
-
-check_tag $child
-check_tag ${CHILD}_BASE
-
-cat << EOF > ".mergeinfo"
-parent=$parent
-PARENT=$PARENT
-child=$child
-CHILD=$CHILD
-date=$date
-module=$module
-dir=$dir
-CONFLICTS=$CONFLICTS
-OPERATION=Land
-OPERWHERE=onto
-EOF
-
-echo PARENT $PARENT parent $parent CHILD $CHILD child $child date $date
-
-# Update your tree to the PARENT branch; HEAD is not really a branch, so you
-# need to update -A instead of update -r HEAD, or the commit will fail. -p
-echo -n "Updating to $parent ...."
-if [ $parent == "HEAD" ]; then
- $CVS update -AdP $dir
-else
- $CVS update -r $parent -dP $dir
-fi
-echo "done"
-
-echo -n "Create land-to point on $parent as ${PARENT}_${CHILD}_LAND_PARENT_$date ..."
-$CVS rtag -r $parent ${PARENT}_${CHILD}_LAND_PARENT_$date $module
-echo "done"
-
-echo -n "Create land-from point on ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date ..."
-$CVS rtag -r ${child} ${PARENT}_${CHILD}_LAND_CHILD_$date $module
-echo "done"
-
-echo -n "Preserve old base tag on $parent ${CHILD}_BASE as ${CHILD}_BASE_PREV ..."
-$CVS rtag -F -r ${CHILD}_BASE ${CHILD}_BASE_PREV $module
-echo "done"
-
-# Apply all of the changes to your local tree:
-echo -n "Updating as -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date ..."
-$CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_LAND_CHILD_$date -dP $dir
-echo "done"
-
-echo -n "Recording conflicts in $CONFLICTS ..."
-$CVS update | awk '/^C/ { print $2 }' > $CONFLICTS
-if [ -s $CONFLICTS ] ; then
- echo "Conflicts found, fix before committing."
- cat $CONFLICTS
-else
- echo "No conflicts found"
- rm -f $CONFLICTS
-fi
-echo "done"
-
-echo "Build, test, commit and then run land2.sh (no arguments)"
+++ /dev/null
-#!/bin/bash -e
-
-CVS=cvs
-
-if [ ! -f .mergeinfo ] ; then
- echo ".mergeinfo doesn't exist - exit"
- exit
-fi
-
-. .mergeinfo
-
-if [ "$OPERATION" != "Land" ] ; then
- echo "OPERATION must be Land - is $OPERATION"
- echo "You should probably be running ${OPERATION}2.sh"
- exit
-fi
-
-if [ -f "$CONFLICTS" ] ; then
- echo "$CONFLICTS exists - clean up first"
- cat $CONFLICTS
- exit
-fi
-
-cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
-
-echo -n "Tagging as ${CHILD}_BASE_$date ..."
-$CVS rtag -r $parent ${CHILD}_BASE_$date $module
-echo "done"
-echo -n "Tagging as ${CHILD}_BASE ..."
-$CVS rtag -F -r $parent ${CHILD}_BASE $module
-
-echo "saving .mergeinfo as .mergeinfo-$date"
-mv .mergeinfo .mergeinfo-$date
-echo "done"
+++ /dev/null
-#!/bin/bash -e
-
-CONFLICTS=cvs-merge-conflicts
-CVS="cvs -z3"
-
-if [ -f .mergeinfo ] ; then
- echo ".mergeinfo exists - clean up first"
- exit
-fi
-
-if [ -f $CONFLICTS ] ; then
- echo "$CONFLICTS exists - clean up first"
- exit
-fi
-
-if [ $# -lt 2 -o $# -gt 3 ]; then
- echo "This is phase 1 of merging branches. Usage: $0 parent child dir"
- exit
-fi
-
-parent=$1
-PARENT=`echo $parent | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
-child=$2
-CHILD=`echo $child | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
-date=`date +%Y%m%d_%H%M`
-
-dir=${3:-.}
-module=$(basename $(<$dir/CVS/Repository))
-
-if [ "$module" = "lustre" ] ; then
- echo >&2 "${progname}: You probably want to merge lustre or portals, not the whole tree."
- echo >&2 "${progname}: Try using ${0} $parent $child lustre"
- exit 1
-fi
-
-
-case $parent in
- HEAD) : ;;
- b_*|b[1-4]*) : ;;
- *) parent="b_$parent" ;;
-esac
-case $child in
- HEAD) : ;;
- b_*|b[1-4]*) : ;;
- *) child="b_$child"
-esac
-
-if [ "$child" != "HEAD" -a "`cat $dir/CVS/Tag 2> /dev/null`" != "T$child" ]; then
- echo "This script must be run within the $child branch"
- exit 1
-fi
-
-TEST_FILE=${TEST_FILE:-ChangeLog} # does this need to be smarter?
-[ $dir = "build" ] && TEST_FILE=lbuild
-check_tag() {
- [ -z "$1" ] && echo "check_tag() missing arg" && exit3
- [ "$1" = "HEAD" ] && return
- $CVS log $dir/$TEST_FILE 2> /dev/null | grep -q " $1: " && return
- echo "$0: tag $1 not found in $dir/$TEST_FILE"
- exit 2
-}
-
-check_tag $parent
-check_tag ${CHILD}_BASE
-
-cat << EOF > .mergeinfo
-parent=$parent
-PARENT=$PARENT
-child=$child
-CHILD=$CHILD
-date=$date
-dir=$dir
-module=$module
-CONFLICTS=$CONFLICTS
-OPERATION=Merge
-OPERWHERE=from
-EOF
-
-echo PARENT: $PARENT parent: $parent CHILD: $CHILD child: $child date: $date
-
-echo -n "tagging $parent as '${PARENT}_${CHILD}_UPDATE_PARENT_$date' ...."
-$CVS rtag -r $parent ${PARENT}_${CHILD}_UPDATE_PARENT_$date $module
-echo "done"
-echo -n "tagging $child as '${PARENT}_${CHILD}_UPDATE_CHILD_$date' ...."
-$CVS rtag -r $child ${PARENT}_${CHILD}_UPDATE_CHILD_$date $module
-echo "done"
-
-# Apply all of the changes to your local tree:
-echo "Updating: -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_UPDATE_PARENT_$date ...."
-$CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_UPDATE_PARENT_$date -dP $dir
-echo "done"
-
-echo -n "Recording conflicts in $CONFLICTS ..."
-$CVS update | awk '/^C/ { print $2 }' > $CONFLICTS
-if [ -s $CONFLICTS ] ; then
- echo "Conflicts found, fix before committing."
- cat $CONFLICTS
-else
- echo "No conflicts found"
- rm -f $CONFLICTS
-fi
-echo "done"
-
-echo "Build, test, commit and then run merge2.sh (no arguments)"
+++ /dev/null
-#!/bin/bash -e
-
-if [ ! -f .mergeinfo ] ; then
- echo ".mergeinfo doesn't exist - exit"
- exit
-fi
-
-. .mergeinfo
-
-if [ "$OPERATION" != "Merge" ] ; then
- echo "OPERATION must be Merge - is $OPERATION"
- echo "You should probably be running ${OPERATION}2.sh"
- exit
-fi
-
-if [ -f $CONFLICTS ] ; then
- echo "$CONFLICTS exists - clean up first"
- cat $CONFLICTS
- exit
-fi
-
-cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
-
-echo -n "Tagging ${PARENT}_${CHILD}_UPDATE_PARENT_$date as ${CHILD}_BASE_$date ..."
-cvs rtag -r ${PARENT}_${CHILD}_UPDATE_PARENT_$date ${CHILD}_BASE_$date $module
-echo "done"
-echo -n "Tagging ${CHILD}_BASE as ${CHILD}_BASE_PREV ...."
-cvs rtag -F -r ${CHILD}_BASE ${CHILD}_BASE_PREV $module
-echo "done"
-echo "${CHILD}_BASE_$date as ${CHILD}_BASE ..."
-cvs rtag -F -r ${CHILD}_BASE_$date ${CHILD}_BASE $module
-
-echo "saving .mergeinfo as .mergeinfo-$date"
-mv .mergeinfo .mergeinfo-$date
-echo "done"
+++ /dev/null
-#!/bin/bash -e
-
-progname=${0##*/}
-
-CONFLICTS=cvs-merge-conflicts
-CVS=cvs
-
-if [ -f .mergeinfo ] ; then
- echo ".mergeinfo exists - clean up first"
- exit
-fi
-
-if [ -f $CONFLICTS ] ; then
- echo "$CONFLICTS exists - clean up first"
- exit
-fi
-
-if [ $# -lt 2 -o $# -gt 3 ]; then
- echo "This is phase 1 of replacing branches. Run this in the PARENT tree. Usage: $0 parent(will be replaced) child(will become the new parent) [dir]"
- exit
-fi
-
-parent=$1
-PARENT=`echo $parent | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
-child=$2
-CHILD=`echo $child | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
-date=`date +%Y%m%d_%H%M`
-
-dir=${3:-.}
-module=$(basename $(<$dir/CVS/Repository))
-
-if [ "$module" = "lustre" ] ; then
- echo >&2 "${progname}: You probably want to land lustre or lnet, not the whole tree."
- echo >&2 "${progname}: Try using ${0} $parent $child lustre"
- exit 1
-fi
-
-case $parent in
- HEAD) : ;;
- b_*|b[1-4]*) : ;;
- *) parent="b_$parent" ;;
-esac
-case $child in
- HEAD) : ;;
- b_*|b[1-4]*) : ;;
- *) child="b_$child"
-esac
-
-if [ "$parent" != "HEAD" -a "`cat $dir/CVS/Tag 2> /dev/null`" != "T$parent" ]; then
- echo "${progname}: this script must be run within the $parent branch"
- exit 1
-fi
-
-TEST_FILE=${TEST_FILE:-ChangeLog} # does this need to be smarter?
-check_tag() {
- [ -z "$1" ] && echo "check_tag() missing arg" && exit3
- [ "$1" = "HEAD" ] && return
- $CVS log ${dir%%/*}/$TEST_FILE 2> /dev/null | grep -q " $1: " && return
- echo "${progname}: tag $1 not found in $dir/$TEST_FILE"
- exit 2
-}
-
-check_tag $child
-check_tag ${CHILD}_BASE
-
-cat << EOF > ".mergeinfo"
-parent=$parent
-PARENT=$PARENT
-child=$child
-CHILD=$CHILD
-date=$date
-module=$module
-dir=$dir
-CONFLICTS=$CONFLICTS
-OPERATION=Replace
-OPERWHERE=onto
-EOF
-
-echo PARENT $PARENT parent $parent CHILD $CHILD child $child date $date
-
-# Update your tree to the PARENT branch; HEAD is not really a branch, so you
-# need to update -A instead of update -r HEAD, or the commit will fail. -p
-echo -n "Updating to $parent ...."
-if [ $parent == "HEAD" ]; then
- $CVS update -AdP $dir
-else
- $CVS update -r $parent -dP $dir
-fi
-echo "done"
-
-# Tag parent before merge
-echo -n "Create land-to point on $parent as ${PARENT}_${CHILD}_REPLACE_PARENT_$date ..."
-$CVS rtag -r $parent ${PARENT}_${CHILD}_REPLACE_PARENT_$date $module
-echo "done"
-
-# Tag child before merge
-echo -n "Create land-from point on ${child} ${PARENT}_${CHILD}_REPLACE_CHILD_$date ..."
-$CVS rtag -r ${child} ${PARENT}_${CHILD}_REPLACE_CHILD_$date $module
-echo "done"
-
-# In case someone tries to re-land later
-echo -n "Preserve old base tag on $parent ${CHILD}_BASE as ${CHILD}_BASE_PREV ..."
-$CVS rtag -F -r ${CHILD}_BASE ${CHILD}_BASE_PREV $module
-echo "done"
-
-# Apply all of the changes to your local tree:
-echo -n "Updating as -j $parent -j $child ..."
-$CVS update -j $parent -j $child -dP $dir
-echo "done"
-
-echo -n "Recording conflicts in $CONFLICTS ..."
-$CVS update $dir | awk '/^C/ { print $2 }' > $CONFLICTS
-if [ -s $CONFLICTS ] ; then
- echo "Conflicts found, fix before committing."
- cat $CONFLICTS
-fi
-echo "done"
-
-echo -n "Verifying that there are no diffs from $child ..."
-$CVS diff --brief -r $child $dir >> $CONFLICTS
-if [ -s $CONFLICTS ] ; then
- echo "Danger! The child branch $CHILD differs from the updated branch $dir"
- cat $CONFLICTS
-else
- echo "No conflicts found"
- rm -f $CONFLICTS
-fi
-echo "done"
-
-echo "Build, test, commit and then run replace2.sh (no arguments)"
+++ /dev/null
-#!/bin/bash -e
-
-CVS=cvs
-
-if [ ! -f .mergeinfo ] ; then
- echo ".mergeinfo doesn't exist - exit"
- exit
-fi
-
-. .mergeinfo
-
-if [ "$OPERATION" != "Replace" ] ; then
- echo "OPERATION must be Replace - is $OPERATION"
- echo "You should probably be running ${OPERATION}2.sh"
- exit
-fi
-
-if [ -f "$CONFLICTS" ] ; then
- echo "$CONFLICTS exists - clean up first"
- cat $CONFLICTS
- exit
-fi
-
-cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
-
-# Tag parent
-echo -n "Tagging as ${CHILD}_REPLACED_${PARENT}_$date ..."
-$CVS rtag -r $parent ${CHILD}_REPLACED_${PARENT}_$date $module
-echo "done"
-# In case someone tries to re-land later
-echo -n "Tagging as ${CHILD}_BASE ..."
-$CVS rtag -F -r $parent ${CHILD}_BASE $module
-
-echo "saving .mergeinfo as .mergeinfo-$date"
-mv .mergeinfo .mergeinfo-$date
-echo "done"
+++ /dev/null
-files
-liblustre
-liblustre.substvars
-linux-patch-lustre
-lustre-dev
-lustre-source
-lustre-tests
-lustre-tests.substvars
-lustre-utils
-lustre-utils.substvars
-tmp
-
+++ /dev/null
-.tmp_versions
-Makefile
-Rules
-aclocal.m4
-autoMakefile
-autoMakefile.in
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-install-sh
-lustre-ldiskfs-*.tar.gz
-lustre-ldiskfs.spec
-missing
-mkinstalldirs
-module.order
-modules.order
-Module.symvers
-Module.markers
-Modules.symvers
-stamp-h1
+++ /dev/null
-.*.cmd
-Makefile
-autoMakefile.in
-autoMakefile
-ldiskfs.ko
-ldiskfs.mod.c
-linux-stage
-linux
-modules.order
-*.c
-*.h
-.*.o.d
-.*.swp
-sources
+++ /dev/null
-#!/bin/bash
-
-LC_COLLATE="C"
-progname="${0##*/}"
-
-warn ()
-{
- [ "$1" ] && echo >&2
- [ "$1" ] && echo "$progname: $1" >&2
- [ "$1" ] && echo >&2
-}
-
-fatal ()
-{
- warn "$2"
- exit "$1"
-}
-
-usage ()
-{
- cat <<EOF
-Usage: $progname <tag> <pindate>
- where <tag> is a tag of the ldiskfs module
- and <pindate> is an optional quoted timestamp suitable for cvs -D
-EOF
-}
-
-if [ -z "$LDISKFSCVS_UPDATED" ] ; then
- echo "$progname: updating ldiskfscvs"
- cvs up -l || fatal 1 "Error updating ldiskfscvs"
- export LDISKFSCVS_UPDATED=yes
- exec "$0" "$@"
-fi
-
-[ "$1" = "-r" ] && shift
-
-buildtag="HEAD"
-tag="$1"
-shift
-pindate=$1
-shift
-
-if [ "$*" ] ; then
- usage >&2
- exit 1
-fi
-
-case "$tag" in
- '')
- warn "a tag is required."
- usage >&2
- exit 1
- ;;
- --help | -h)
- usage
- exit 0
- ;;
-
- # this is the branch table
- # keep this list sorted alphabetically!
-
- # So far there's just HEAD.
-
- *)
- buildtag="HEAD"
- ;;
-esac
-
-error_modules=
-cvs_cmd ()
-{
- dir="$1"
- module="$2"
- tag="$3"
- cotag=""
- update=""
-
- if [ "$tag" = "HEAD" ] ; then
- cotag=""
- uptag="-A"
- elif [ "$tag" ] ; then
- cotag="-r $tag"
- uptag="-r $tag"
- else
- # silently skip if no tag was specified
- return
- fi
-
- # create a cvs date format that will survive shell expansion
- if [ -n "$pindate" ]; then
- datecmd=$(date -u +%s -d "$pindate")
- datecmd="-D @$datecmd"
- else
- datecmd=""
- fi
-
- if [ -d "$dir" ] ; then
- echo "$progname: Updating $dir to $tag"
- ( cd "$dir" && cvs up $datecmd -dAP $uptag )
- else
- echo "$progname: Checking out $dir from $tag"
- cvs co $datecmd -P $cotag -d "$dir" "$module"
- fi
- if [ $? != 0 ] ; then
- error_modules="$dir $error_modules"
- fi
-}
-
-cvs_cmd build lustre-build "$buildtag"
+++ /dev/null
-Kernelenv
-Makefile
-autoMakefile
-autoMakefile.in
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-.*.cmd
-.depend
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-config.h
-stamp-h
-stamp-h1
-stamp-h.in
-Makefile
-Makefile.in
+++ /dev/null
-Makefile.in
-Makefile
+++ /dev/null
-Makefile.in
-Makefile
+++ /dev/null
-Makefile.in
-Makefile
+++ /dev/null
-Makefile.in
-Makefile
+++ /dev/null
-Makefile.in
-Makefile
+++ /dev/null
-.deps
-Makefile
-link-stamp
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
-.*.o.cmd
-.*.o.d
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
-*.o.cmd
+++ /dev/null
-.deps
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-lib
-Makefile
-Makefile.in
-INSTALL
+++ /dev/null
-.deps
-.dirstamp
+++ /dev/null
-.deps
-.dirstamp
+++ /dev/null
-.deps
-.dirstamp
+++ /dev/null
-.deps
-.dirstamp
+++ /dev/null
-.deps
-.dirstamp
+++ /dev/null
-.deps
-.dirstamp
+++ /dev/null
-.deps
-Makefile
-Makefile.in
+++ /dev/null
-Kernelenv
-Makefile
-autoMakefile
-autoMakefile.in
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-.*.cmd
-.depend
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
-*.eps
-*.pdf
+++ /dev/null
-config.h
-stamp-h
-stamp-h1
-stamp-h.in
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile.in
-Makefile
+++ /dev/null
-Makefile
-autoMakefile
-autoMakefile.in
-.*.cmd
-.depend
+++ /dev/null
-.deps
-Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.cmd
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
-
+++ /dev/null
-.deps
-.depend
-.tmp_versions
-.*.flags
-.*.o.cmd
-.*.d
-autoMakefile.in
-autoMakefile
-Makefile
-*.ko
-*.mod.c
-wirecheck
+++ /dev/null
-.deps
-Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.*.cmd
-.tmp_versions
-.depend
-wirecheck
+++ /dev/null
-.deps
-Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.*.cmd
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
-wirecheck
+++ /dev/null
-.deps
-.depend
-.tmp_versions
-.*.o.cmd
-.*.o.d
-.*.flags
-autoMakefile.in
-autoMakefile
-Makefile
-*.ko
-*.mod.c
+++ /dev/null
-.deps
-Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-autoMakefile
-autoMakefile.in
+++ /dev/null
-.deps
-Makefile
-Makefile.in
+++ /dev/null
-.deps
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
-acceptor
-debugctl
-ptlctl
-.deps
-routerstat
-wirecheck
-gmlndnid
-lst
-lstclient
-.*.cmd
+++ /dev/null
-Kernelenv
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-.*.cmd
-.depend
-COPYING
-INSTALL
-install-sh
-lustre-iokit.spec
-lustre-iokit*.tar.gz
-missing
-mkinstalldirs
-modules.order
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-.Xrefs
-.Xrefs-2.5
-aclocal.m4
-config.log
-config.status
-config.cache
-config.guess
-config.sub
-configure
-Makefile
-autoMakefile
-autoMakefile.in
-.deps
-tags
-TAGS
-lustre*.tar.gz
-cscope.files
-cscope.out
-autom4te-2.53.cache
-autom4te.cache
-depcomp
-compile
-.*.cmd
-.mergeinfo-*
-Rules
-missing
-mkinstalldirs
-install-sh
-.depend
-.tmp_versions
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-Makefile.in
-.deps
-tags
-TAGS
-OBD-HOWTO.html
-OBD-HOWTO.txt
-lustre-HOWTO.lyx
-lustre-HOWTO.txt
-lustre-pdf.bbl
-lustre-pdf.blg
-lustre-pdf.log
-lustre-pdf.out
-lustre-pdf.toc
-*.eps
-lustre.lyx
-*.tex
-*.pdf
-*.aux
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-config.h
-config.h.in
-stamp-h
-stamp-h1
-stamp-h.in
-Makefile
-Makefile.in
-.deps
-TAGS
-lustre_ver.h
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-Makefile.in
-.deps
-TAGS
-extN_fs.h
-extN_fs_i.h
-extN_fs_sb.h
-extN_jbd.h
-extN_xattr.h
-xattr.h
-lustre_build_version.h
+++ /dev/null
-Makefile
-Makefile.in
-lustre_build_version.h
+++ /dev/null
-.*.cmd
-.*.flags
-*.ko
-*.c
-.tmp_versions
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-Makefile.in
-.deps
-TAGS
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.cmd
-.*.flags
-.*.o.d
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-Makefile.in
-.*.cmd
-.*.flags
-.tmp_versions
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-Makefile.in
-.deps
-TAGS
-libtest
+++ /dev/null
-Makefile
-Makefile.in
-.deps
-echo_test
-recovery_small
-replay_ost_single
-replay_single
-sanity
+++ /dev/null
-Makefile
-Makefile.in
-.deps
-
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.cmd
-.*.flags
-.*.o.d
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.deps
-Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.*.o.d
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-fsfilt-*.c
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
-sources
-fsfilt_ldiskfs.*
-fsfilt-ldiskfs.*
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.o.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.o.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.o.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.*.d
-.*.ver
-.tmp_versions
-.depend
+++ /dev/null
-Makefile
-Makefile.in
+++ /dev/null
-Makefile
-Makefile.in
-.*.cmd
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-tags
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-tags
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.depend
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.o.flags
-.tmp_versions
-.depend
+++ /dev/null
-.Xrefs
-lustre.spec
-config.log
-config.status
-configure
-Makefile
-Makefile.in
-.deps
-TAGS
-version_tag.pl
-lustre_createcsv.sh
-lustre_config.sh
-lc_net.sh
-lc_modprobe.sh
-lc_hb.sh
-lc_cluman.sh
-lc_md.sh
-lc_lvm.sh
-lc_cluman
-lc_hb
-lc_lvm
-lc_md
-lc_modprobe
-lc_net
-lustre_config
-lustre_createcsv
-lustre_start
+++ /dev/null
-.tmp_versions
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-Makefile.in
-.deps
-TAGS
-openunlink
-testreq
-truncate
-directio
-openme
-writeme
-mcreate
-munlink
-mlink
-tchmod
-toexcl
-fsx
-test_brw
-newfile
-openclose
-createdestroy
-createmany
-statmany
-mkdirmany
-lovstripe
-*.xml
-stat
-setuid
-multifstat
-checkstat
-wantedi
-createtest
-open_delay
-statone
-opendevunlink
-opendirunlink
-runas
-openfile
-unlinkmany
-fchdir_test
-*.cmd
-getdents
-o_directory
-mkdirdeep
-utime
-small_write
-multiop
-sleeptest
-write_disjoint
-write_append_truncate
-ll_sparseness_verify
-ll_sparseness_write
-mrename
-cmknod
-iopentest1
-iopentest2
-XMLCONFIG
-*.log
-logs
-ostactive
-ll_dirstripe_verify
-openfilleddirunlink
-copy_attr
-rename_many
-memhog
-mmap_sanity
-rmdirmany
-flock_test
-flocks_test
-writemany
-reads
-chownmany
-llverdev
-llverfs
-ll_getstripe_info
-it_test
-write_time_limit
-sendfile
-rwv
-copytool
-
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-Makefile.in
-.deps
-TAGS
-createmany-mpi
-mdsrate
-parallel_grouplock
-write_append_truncate
-write_disjoint
-*.cmd
-*.log
+++ /dev/null
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-Makefile.in
-.deps
-tags
-TAGS
-mkfs.lustre
-mount.lustre
-tunefs.lustre
-lctl
-lfs
-wirecheck
-wiretest
-llog_reader
-lr_reader
-obdio
-obdbarrier
-lload
-llverfs
-llverdev
-l_getidentity
-l_facl
-req_layout
-l_getgroups
-.*.cmd
-.*.d
-mkfs_lustre
-mount_lustre
-tunefs_lustre
-loadgen
-lreplicate
-lshowmount
-ll_recover_lost_found_objs
+++ /dev/null
-Makefile
-Makefile.in
-.deps
-*.pyc
+++ /dev/null
-.Xrefs
-Makefile
-Makefile.in
-.deps
-tags
-TAGS
-lgssd
-lsvcgssd
-l_idmap
-lgss_keyring
-.*.cmd
-.*.d
+++ /dev/null
-Makefile
-Makefile.in
-.deps
+++ /dev/null
-Makefile
-Makefile.in