From d6c8365795c4fb1af83b79f26f782e0834f6bdfc Mon Sep 17 00:00:00 2001
From: Carl Worth
Date: Thu, 12 Dec 2013 23:07:26 -0800
Subject: [PATCH] docs: Update note regarding nominating patches for the stable
branch.
This brings the documentation up to date with the current practice of using
the CC syntax for patch nomination.
---
docs/devinfo.html | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/docs/devinfo.html b/docs/devinfo.html
index 38c052ae966..a9d8b4f7db8 100644
--- a/docs/devinfo.html
+++ b/docs/devinfo.html
@@ -190,11 +190,26 @@ you should add an appropriate note to the commit message.
Here are some examples of such a note:
- - NOTE: This is a candidate for the 9.0 branch.
- - NOTE: This is a candidate for the 8.0 and 9.0 branches.
- - NOTE: This is a candidate for the stable branches.
+ - CC: <mesa-stable@lists.freedesktop.org>
+ - CC: "9.2 10.0" <mesa-stable@lists.freedesktop.org>
+ - CC: "10.0" <mesa-stable@lists.freedesktop.org>
+Simply adding the CC to the mesa-stable list address is adequate to nominate
+the commit for the most-recently-created stable branch. It is only necessary
+to specify a specific branch name, (such as "9.2 10.0" or "10.0" in the
+examples above), if you want to nominate the commit for an older stable
+branch. And, as in these examples, you can nominate the commit for the older
+branch in addition to the more recent branch, or nominate the commit
+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 nominate for the stable branch after it has already been commited,
+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).
Cherry-picking candidates for a stable branch
--
2.30.2