From 98efc51cdd45ed8cd36858733a7a0f58e1a3d2bd Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Jun 2013 18:22:33 +1000
Subject: [PATCH] remove references to (unused) pre-{merge,build} directories

---
 do_merge   | 6 ------
 merge_akpm | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/do_merge b/do_merge
index 35f3f57..0d1cc1b 100755
--- a/do_merge
+++ b/do_merge
@@ -108,9 +108,6 @@ for h in $heads; do
 	hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
 	log Merging $h "($hlog)"
 	old_head=$(git rev-parse HEAD)
-	[ -x "../pre-merge/$tree" ] && {
-		"../pre-merge/$tree" || bash -i || exit
-	}
 	case "$h" in
 	*:*)
 		do_rebase $h $tree
@@ -138,9 +135,6 @@ for h in $heads; do
 	tab="\t"
 	[ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
 	printf "%s$tab%s\n" $tree $(git show-ref --hash "${h/\/*://}") >> $SHA1_FILE
-	[ -x "../pre-build/$tree" ] && {
-		"../pre-build/$tree" || bash -i || exit
-	}
 	$no_build && continue
 	$need_build || {
 		# See if we need to build after merging this tree
diff --git a/merge_akpm b/merge_akpm
index dc8a88c..c1bb89d 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -51,9 +51,6 @@ printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $S
 		}
 	done
 }
-[ -x "../pre-build/akpm-current" ] && {
-	"../pre-build/akpm-current" || bash -i || exit
-}
 
 new_head=$(git rev-parse HEAD)
 
@@ -112,9 +109,6 @@ printf "%s\t\t%s\n" akpm $(git show-ref --hash akpm/master) >> $SHA1_FILE
 		}
 	done
 }
-[ -x "../pre-build/akpm" ] && {
-	"../pre-build/akpm" || bash -i || exit
-}
 
 new_head=$(git rev-parse HEAD)
 
-- 
2.39.2