remove support for quilt trees

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index 2e3cf9ce7072970e1e49323d69a00ea0ddd780b3..806fc67a502179ab1b019176f6890a796e2b82e4 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -56,7 +56,7 @@ fi
 
 heads=$(awk -F '\t' '
        /^#/ { next; }
-       $2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }
+       $2=="git" { printf("%s/%s ", $3, $5); }
        $2=="branch" { printf("branch/%s ", $1); }' "$CTRL_FILE")
 
 need_build=false
@@ -74,6 +74,7 @@ for h in $heads; do
 
        if [ "$tree" = "branch" ]; then
                git branch -f "${h#branch/}"
+               linux-next-notify "update branch $1"
                continue
        fi