bippy: mbox cleanups and rewording

Also message can be properly signed by git send-email now.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 11 insertions, 11 deletions

diff --git a/scripts/bippy b/scripts/bippy
index 0e8e3772..7c3ac842 100755
--- a/scripts/bippy
+++ b/scripts/bippy
@@ -628,6 +628,8 @@ fi	# end json creation
 #########################
 if [[ "${MBOX_FILE}" != "" ]] ; then
 	cat << EOF > "${MBOX_FILE}"
+From 25bdc8c4ca5caa00d7a85492ac9c76688a44c8e2 Mon Sep 17 00:00:00 2001
+From: Greg KH <gregkh@linuxfoundation.org>
 To: <linux-cve-announce@vger.kernel.org>
 Reply-to: <cve@kernel.org>
 Subject: ${CVE_NUMBER}: ${subject}
@@ -640,15 +642,9 @@ ${commit_text}
 The Linux kernel CVE team has assigned ${CVE_NUMBER} to this issue.
 
 
-Mitigation
-==========
-
-The individual change to resolve this issue can be found at:
-	${URL}
-
-
 Affected versions
 =================
+
 EOF
 	for line in "${vuln_array_mbox[@]}"; do
 		echo "	${line}" >> ${MBOX_FILE}
@@ -657,13 +653,17 @@ EOF
 	cat << EOF >> "${MBOX_FILE}"
 
 
-Recomendation
-=============
+Mitigation
+==========
+
 The Linux kernel CVE team recommends that you update to the latest
 stable kernel version for this, and many other bugfixes.  Individual
-changes are not tested alone, but rather are part of a larger kernel
+changes are never tested alone, but rather are part of a larger kernel
 release.  Cherry-picking individual commits is not recommended or
-supported by the Linux kernel community at all.
+supported by the Linux kernel community at all.  If however, updating to
+the latest release is impossible, the individual change to resolve this
+issue can be found at:
+	${URL}
 EOF
 	dbg "mbox file written to ${MBOX_FILE}"