diff options
| author | Eric Engestrom <eric@engestrom.ch> | 2020-06-07 17:39:56 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-06-19 19:51:53 +0000 |
| commit | 0e4eb7b86d9062c92db6f6f566eff5fe224cb4a8 (patch) | |
| tree | c59ea6137ae4cf8d24d2dd9168c70a023f06b997 /docs/submittingpatches.rst | |
| parent | 8fd98931235c064c087719c0cf1aa14fbd27e3f9 (diff) | |
| download | mesa-0e4eb7b86d9062c92db6f6f566eff5fe224cb4a8.tar.gz | |
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 <eric@engestrom.ch>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5378>
Diffstat (limited to 'docs/submittingpatches.rst')
| -rw-r--r-- | docs/submittingpatches.rst | 7 |
1 files changed, 4 insertions, 3 deletions
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. |