From fa806614c09235ddf35926436b998dd096f81743 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 14 Jul 2022 17:09:00 +1000
Subject: [PATCH] merge_akpm: gut this since Andrew is now using git

---
 merge_akpm | 84 +++++++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/merge_akpm b/merge_akpm
index 4b9be3a..e8163c8 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -25,51 +25,51 @@ execute()
 
 cpwd=../next
 
-git branch -f akpm-current/current akpm/current
+#git branch -f akpm-current/current akpm/current
 
 git branch -f akpm/base HEAD
 
-old_head=$(git rev-parse HEAD)
-hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
-log Merging akpm-current/current "($hlog)"
-execute git merge --no-ff akpm-current/current || {
-	echo Merge failed 1>&2
-	echo $h >>../merge.debug
-	git diff >>../merge.debug 2>&1
-
-	check_unmerged_files akpm-current
-
-	git diff 2>&1 | egrep -q '<<<<<|^\*' && {
-		bash -i || exit
-	}
-	GIT_EDITOR=: execute git commit -v -a
-	execute git diff -M --stat --summary 'HEAD^..'
-}
-printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $SHA1_FILE
-
-[ -f "../merge-fixes/akpm-current" ] && {
-	for p in $(cat "../merge-fixes/akpm-current"); do
-		$(dirname $0)/merge_fix -n "$p" || {
-			bash -i || exit
-		}
-	done
-}
-
-new_head=$(git rev-parse HEAD)
-
-$no_build ||
-	[ "$old_head" = "$new_head" ] ||
-	[ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
-
-	git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
-		echo git push failed 1>&2
-		bash -i || exit
-	}
-	"$bin_dir/do_build" akpm-current || {
-		echo Build failed 1>&2
-		bash -i || exit
-	}
-}
+#old_head=$(git rev-parse HEAD)
+#hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
+#log Merging akpm-current/current "($hlog)"
+#execute git merge --no-ff akpm-current/current || {
+#	echo Merge failed 1>&2
+#	echo $h >>../merge.debug
+#	git diff >>../merge.debug 2>&1
+#
+#	check_unmerged_files akpm-current
+#
+#	git diff 2>&1 | egrep -q '<<<<<|^\*' && {
+#		bash -i || exit
+#	}
+#	GIT_EDITOR=: execute git commit -v -a
+#	execute git diff -M --stat --summary 'HEAD^..'
+#}
+#printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $SHA1_FILE
+#
+#[ -f "../merge-fixes/akpm-current" ] && {
+#	for p in $(cat "../merge-fixes/akpm-current"); do
+#		$(dirname $0)/merge_fix -n "$p" || {
+#			bash -i || exit
+#		}
+#	done
+#}
+#
+#new_head=$(git rev-parse HEAD)
+#
+#$no_build ||
+#	[ "$old_head" = "$new_head" ] ||
+#	[ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
+#
+#	git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
+#		echo git push failed 1>&2
+#		bash -i || exit
+#	}
+#	"$bin_dir/do_build" akpm-current || {
+#		echo Build failed 1>&2
+#		bash -i || exit
+#	}
+#}
 
 execute git clone -s -l -n -q . ../rebase-tmp || {
 	echo Clone failed 1>&2
-- 
2.39.5