From: Eric Engestrom Date: Sun, 7 Jun 2020 15:39:56 +0000 (+0200) Subject: docs: prefer `Fixes:` over `Cc: mesa-stable` X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=0e4eb7b86d9062c92db6f6f566eff5fe224cb4a8 docs: prefer `Fixes:` over `Cc: mesa-stable` `Fixes:` targets a specific commit and as such is much more precise and useful than `Cc: mesa-stable`, so let's prefer it when applicable. Signed-off-by: Eric Engestrom Reviewed-by: Eric Anholt Part-of: --- diff --git a/docs/submittingpatches.rst b/docs/submittingpatches.rst index 1ef8493511d..05e7ffe7db4 100644 --- a/docs/submittingpatches.rst +++ b/docs/submittingpatches.rst @@ -251,11 +251,12 @@ the code before merging their patches. Nominating a commit for a stable branch --------------------------------------- -There are three ways to nominate a patch for inclusion in the stable -branch and release. +There are several ways to nominate a patch for inclusion in the stable +branch and release. In order or preference: +- By adding the ``Fixes:`` tag as described above, if you are fixing + a specific commit. - By adding the ``Cc: mesa-stable`` tag as described below. -- By adding the fixes: tag as described below. - By submitting a merge request against the "staging/year.quarter" branch on gitlab.