X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=merge_akpm;h=0c3684d74887a3e0ceb347faa0963755c3a9f424;hb=e8d4ba815a033ff46dc0891daac5c309d0480d6c;hp=f3181dd0b6d1b87452de8a0480adc6eb63c27fb5;hpb=a1da89c3815d37ec96fc9f298560852b2231e853;p=next-scripts diff --git a/merge_akpm b/merge_akpm index f3181dd..0c3684d 100755 --- a/merge_akpm +++ b/merge_akpm @@ -68,7 +68,7 @@ $no_build || 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 } @@ -89,7 +89,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || { bash -i || exit } echo "fix up?" -notify-send "Waiting for akpm fix up" +linux-next-notify "Waiting for akpm fix up" bash -i log '$' cd $cpwd cd $cpwd @@ -127,7 +127,7 @@ $no_build || 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 }