remove obsolete commands

diff --git a/do_merge1 b/do_merge1
deleted file mode 100755 (executable)
index 5eea77b..0000000
--- a/do_merge1
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-LOG_FILE="../merge.log"
-build_host="sprygo"
-build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
-
-no_build=false
-[ "$1" = "-n" ] && {
-       shift
-       no_build=true
-}
-[ -n "$1" ] && build_host="$1"
-
-log()
-{
-       echo "$@" | tee -a $LOG_FILE
-}
-
-execute()
-{
-       log "$" $@
-       $@ 2>&1 | tee -a $LOG_FILE
-       return ${PIPESTATUS[0]}
-}
-
-heads=$(grep -v '^#' ../real_control | awk -F '        ' '$2=="quilt" { printf("quilt/%s ", $3); } $2=="git" { printf("%s/%s ", $3, $5); }')
-
-need_build=false
-
-for h in $heads; do
-       tree=${h%/*}
-       [ "$tree" == "quilt" ] && tree=${h#quilt/}
-       log Merging $h
-       old_head=$(git rev-parse HEAD)
-       execute git merge $h || {
-               echo Merge failed 1>&2
-               bash -i || exit
-               GIT_EDITOR=: execute git commit -v -a
-               execute git diff -M --stat --summary 'HEAD^..'
-       }
-       $no_build && continue
-       $need_build || {
-               # See if we need to build after merging this tree
-               new_head=$(git rev-parse HEAD)
-               [ "$old_head" = "$new_head" ] ||
-                       need_build=true
-               $need_build ||
-                       [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] ||
-                       need_build=true
-       }
-       $need_build ||
-               continue
-       do_build=$(grep -v '^#' ../real_control | awk -F '      ' '$3=="'$tree'" { print $6; }')
-       [ "$do_build" = "yes" ] ||
-               continue
-       rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || {
-               echo Rsync failed 1>&2
-               bash -i || exit
-       }
-       ssh "$build_host" "$build_cmd" || {
-               echo Build failed 1>&2
-               bash -i || exit
-       }
-       need_build=false
-done
-
-exit 0

diff --git a/merge_msg1 b/merge_msg1
deleted file mode 100755 (executable)
index 0ff3170..0000000
--- a/merge_msg1
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-log=../merge.log
-[ -f merge.log ] && log=merge.log
-control=../real_control
-[ -f real_control ] && control=real_control
-
-branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //')
-branch=${branch#quilt/}
-branch=${branch%%/*}
-
-contact=$(sed -n "/    $branch /s/     .*$//p" $control)
-
-gitk --merge -- $1 &
-gvim $1
-sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree&Body=Hi ,%0A\
-%0A\
-Today's linux-next merge of the $branch tree got a conflict in $1 between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree."
-