X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=merge_akpm;h=4b9be3adcb2aa61b3045e61e81933036daf3a29f;hb=HEAD;hp=255b767c7067f7264716aa17ed211638aa733ae5;hpb=fa9840b6611c7d66cdfe8e90a3f922f02a4ff132;p=next-scripts

diff --git a/merge_akpm b/merge_akpm
index 255b767..4b9be3a 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -36,6 +36,9 @@ 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
 	}
@@ -58,11 +61,11 @@ $no_build ||
 	[ "$old_head" = "$new_head" ] ||
 	[ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
 
-	git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+	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" || {
+	"$bin_dir/do_build" akpm-current || {
 		echo Build failed 1>&2
 		bash -i || exit
 	}
@@ -83,6 +86,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
 	bash -i || exit
 }
 echo "fix up?"
+linux-next-notify "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
@@ -116,11 +120,11 @@ $no_build ||
 	[ "$old_head" = "$new_head" ] ||
 	[ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
 
-	git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+	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" || {
+	"$bin_dir/do_build" akpm || {
 		echo Build failed 1>&2
 		bash -i || exit
 	}