From 07384468afdbf6eb2ce43072452a6a87c261b56a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 16 Nov 2016 11:51:50 +0000 Subject: [PATCH] docs/submittingpatches: flesh out "how to nominate" methods MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Emil Velikov Reviewed-by: Brian Paul --- docs/submittingpatches.html | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html index 77b870a1308..39b615bc9af 100644 --- a/docs/submittingpatches.html +++ b/docs/submittingpatches.html @@ -183,6 +183,24 @@ as the issues are resolved first.

Nominating a commit for a stable branch

+

+There are three ways to nominate patch for inclusion of the stable branch and +release. +

+
    +
  • By adding the Cc: mesa-stable@ tag as described below. +
  • Sending the commit ID (as seen in master branch) to the mesa-stable@ mailing list. +
  • Forwarding the patch from the mesa-dev@ mailing list. +
    • +
+

+Note: resending patch identical to one on mesa-dev@ or one that differs only +by the extra mesa-stable@ tag is not recommended. +

+ + +

The stable tag

+

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 -Mesa Stable Queue -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.

Criteria for accepting patches to the stable branch

-- 2.30.2