docs/submittingpatches: flesh out "how to nominate" methods

Currently they are buried within the text, making it hard to find.
Move them to the top and be clear what is _not_ a good idea.

v2: Minor commit polish, use only "resending" as suggested by Matt.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index 77b870a13083d207674a798d3cce67b767b67985..39b615bc9af392738b1c43be891e335c33e35c0f 100644 (file)
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -183,6 +183,24 @@ as the issues are resolved first.
 
 <h2 id="nominations">Nominating a commit for a stable branch</h2>
 
+<p>
+There are three ways to nominate patch for inclusion of the stable branch and
+release.
+</p>
+<ul>
+<li> By adding the Cc: mesa-stable@ tag as described below.
+<li> Sending the commit ID (as seen in master branch) to the mesa-stable@ mailing list.
+<li> Forwarding the patch from the mesa-dev@ mailing list.
+</li>
+</ul>
+<p>
+Note: resending patch identical to one on mesa-dev@ or one that differs only
+by the extra mesa-stable@ tag is <strong>not</strong> recommended.
+</p>
+
+
+<h3 id="thetag">The stable tag</h3>
+
 <p>
 If you want a commit to be applied to a stable branch,
 you should add an appropriate note to the commit message.
@@ -207,16 +225,8 @@ exclusively for the older branch.
 
 This "CC" syntax for patch nomination will cause patches to automatically be
 copied to the mesa-stable@ mailing list when you use "git send-email" to send
-patches to the mesa-dev@ mailing list. Also, if you realize that a commit
-should be nominated for the stable branch after it has already been committed,
-you can send a note directly to the mesa-stable@lists.freedesktop.org where
-the Mesa stable-branch maintainers will receive it. Be sure to mention the
-commit ID of the commit of interest (as it appears in the mesa master branch).
-
-The latest set of patches that have been nominated, accepted, or rejected for
-the upcoming stable release can always be seen on the
-<a href="http://cworth.org/~cworth/mesa-stable-queue/">Mesa Stable Queue</a>
-page.
+patches to the mesa-dev@ mailing list. If you prefer using --suppress-cc that
+won't have any effect negative effect on the patch nomination.
 
 <h2 id="criteria">Criteria for accepting patches to the stable branch</h2>