email address change

[thirdparty/kernel/stable-queue.git] / scripts / quilt-mail

diff --git a/scripts/quilt-mail b/scripts/quilt-mail
index b91fe7ae5d0e6eeb7875bcc9f3d9220a7bf2b760..db766650297330502fbf4e2fe5fe94bca62143d1 100755 (executable)
--- a/scripts/quilt-mail
+++ b/scripts/quilt-mail
@@ -67,7 +67,7 @@ git log --abbrev=12 --format="%aN <%aE>%n    %s%n" ${VERSION}..HEAD > ${TMP_LOG}
 
 # clean up the git tree by deleting it
 cd ${ORIGINAL_DIR}
-rm -rf ${TMP_TREE}
+#rm -rf ${TMP_TREE}
 
 
 echo "Creating the mailbox for kernel release ${FULL_VERSION}"
@@ -85,6 +85,8 @@ echo "Anything received after that time might be too late."
 echo ""
 echo "The whole patch series can be found in one patch at:"
 echo " kernel.org/pub/linux/kernel/v${VER}/stable-review/patch-${FULL_VERSION}.gz"
+echo "or in the git tree and branch at:"
+echo "  git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-${ROOT_VERSION}.y"
 echo "and the diffstat can be found below."
 echo ""
 echo "thanks,"
@@ -136,11 +138,13 @@ ${STABLE_QUEUE}../mbox2send ${ROOT_VERSION} ${FULL_VERSION} ${MBOX}
 #< ${MBOX}.new formail -ds sh -c 'cat > msg.$FILENO'
 splitmbox.py ${MBOX}.new .
 
-# Add Linus and Andrew to the first email only:
+# Add Linus and Andrew and others to the first email only:
 #sed -i -e "s/Cc: alan@lxorguk\.ukuu\.org\.uk/Cc: torvalds@linux-foundation\.org, akpm@linux-foundation\.org, alan@lxorguk\.ukuu\.org\.uk/" ${TMP_DIR}/msg.000
 #sed -i -e "s/Cc: stable@vger\.kernel\.org/Cc: torvalds@linux-foundation\.org, akpm@linux-foundation\.org, stable@vger\.kernel\.org/" ${TMP_DIR}/msg.000
 #sed -i -e "s/Cc: stable@vger\.kernel\.org/Cc: torvalds@linux-foundation\.org, akpm@linux-foundation\.org, linux@roeck-us\.net, shuah\.kh@samsung\.com, stable@vger\.kernel\.org/" ${TMP_DIR}/msg.000
-sed -i -e "s/Cc: stable@vger\.kernel\.org/Cc: torvalds@linux-foundation\.org, akpm@linux-foundation\.org, linux@roeck-us\.net, shuah\.kh@samsung\.com, patches@kernelci\.org stable@vger\.kernel\.org/" ${TMP_DIR}/msg.000
+#sed -i -e "s/Cc: stable@vger\.kernel\.org/Cc: torvalds@linux-foundation\.org, akpm@linux-foundation\.org, linux@roeck-us\.net, shuah\.kh@samsung\.com, patches@kernelci\.org stable@vger\.kernel\.org/" ${TMP_DIR}/msg.000
+#sed -i -e "s/Cc: stable@vger\.kernel\.org/Cc: torvalds@linux-foundation\.org, akpm@linux-foundation\.org, linux@roeck-us\.net, shuah\.kh@samsung\.com, patches@kernelci\.org, ben\.hutchings@codethink\.co\.uk, stable@vger\.kernel\.org/" ${TMP_DIR}/msg.000
+sed -i -e "s/Cc: stable@vger\.kernel\.org/Cc: torvalds@linux-foundation\.org, akpm@linux-foundation\.org, linux@roeck-us\.net, shuahkh@osg\.samsung\.com, patches@kernelci\.org, ben\.hutchings@codethink\.co\.uk, stable@vger\.kernel\.org/" ${TMP_DIR}/msg.000
 
 
 # Create a script to upload the patch to kernel.org and to send the patches out
@@ -149,5 +153,19 @@ echo "kup --host=gregkh@geb.kernel.org put patch-${FULL_VERSION} patch-${FULL_VE
 echo "git send-email msg.*" >> ${TMP_DIR}/send_it_off
 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
+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
+
+# clean up the git tree by deleting it
+cd ${ORIGINAL_DIR}
+rm -rf ${TMP_TREE}
+
+# announce what needs to be done
 echo "cd ${TMP_DIR}"
 echo "./send_it_off"