From af5ac6034ab0dcb5d1a3b8ab15d745110c88ccd4 Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nossum@oracle.com>
Date: Wed, 1 Mar 2023 10:34:49 +0100
Subject: [PATCH] scripts/bad_stable: include instructions to fix and resubmit

This basically implements the suggestion from
<https://lore.kernel.org/stable/46577540-6ed7-0ff5-11d5-2982cd29e92b@oracle.com/>.

Sample output:

  To reproduce the conflict and resubmit, you may use the following commands:

  git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
  git checkout FETCH_HEAD
  git cherry-pick -x 9f46c187e2e680ecd9de7983e4d081c3391acc76
  # <resolve conflicts, build, test, etc.>
  git commit -s
  git send-email --to '<stable@vger.kernel.org>' --in-reply-to '<165314153515625@kroah.com>' --subject-prefix 'PATCH 5.15.y' HEAD^..

Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 scripts/bad_stable | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/bad_stable b/scripts/bad_stable
index 03165f82125..0cd0319fb3a 100755
--- a/scripts/bad_stable
+++ b/scripts/bad_stable
@@ -136,6 +136,15 @@ reply()
 		echo "tree, then please email the backport, including the original git commit"
 		echo "id to <stable@vger.kernel.org>."
 		echo
+		echo "To reproduce the conflict and resubmit, you may use the following commands:"
+		echo
+		echo "git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-$STABLE_VERSION.y"
+		echo "git checkout FETCH_HEAD"
+		echo "git cherry-pick -x $git_id"
+		echo "# <resolve conflicts, build, test, etc.>"
+		echo "git commit -s"
+		echo "git send-email --to '$STABLE' --in-reply-to '$ID' --subject-prefix 'PATCH $STABLE_VERSION.y' HEAD^.."
+		echo
 		echo "Possible dependencies:"
 		echo
 		echo "$(curl --fail --silent https://git.kernel.org/pub/scm/linux/kernel/git/sashal/deps.git/plain/v$STABLE_VERSION/$git_id)"
-- 
2.47.2