From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 18 Jun 2016 03:33:50 +0000 (-0700)
Subject: scripts/quilt-mail: fix merge
X-Git-Tag: v3.14.73~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b9cdfb968d4c686c08cdb6af38365442262dd1a;p=thirdparty%2Fkernel%2Fstable-queue.git

scripts/quilt-mail: fix merge
---

diff --git a/scripts/quilt-mail b/scripts/quilt-mail
index a6f2e390571..420cc5383e0 100755
--- a/scripts/quilt-mail
+++ b/scripts/quilt-mail
@@ -155,7 +155,8 @@ chmod 755 ${TMP_DIR}/send_it_off
 # Push a version of the patches out to the world in a git tree
 cd ${TMP_TREE}
 git checkout linux-${ROOT_VERSION}.y
-git merge -q temp_branch^
+#git merge -q temp_branch^
+git merge -q temp_branch
 echo "git push --force gitolite@ra.kernel.org:/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-${ROOT_VERSION}.y"
 git push --force gitolite@ra.kernel.org:/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-${ROOT_VERSION}.y