[Mesa-dev] [PATCH 3/3] docs/releasing: document how to squash/announce queued patches

[Eric Engestrom]

On Wednesday, 2017-03-15 17:34:26 +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> In the odd case where a patch needs to be fixed, squash the appropriate
> fix and document how. Add a note in the pre-release notes, such that
> devs can quickly spot it.
> 
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  docs/releasing.html | 38 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 38 insertions(+)
> 
> diff --git a/docs/releasing.html b/docs/releasing.html
> index 4db30c2c7a2..3842a73f8d7 100644
> --- a/docs/releasing.html
> +++ b/docs/releasing.html
> @@ -115,6 +115,38 @@ performed where possible.
>  Achieved by combination of local ad-hoc scripts and AppVeyor plus Travis-CI,
>  the latter as part of their Github integration.
>  </p>
> +<p>
> +<strong>Note:</strong> If a patch in the current queue, needs and additional

s/,//; s/and/any/

With that, series is:
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

> +fix(es), then they should be squashed together.
> +<br>
> +The commit messages and the <code>cherry picked from</code> tags must be preserved.
> +</p>
> +<p>
> +This should be noted in the <a href="#prerelease">pre-announce</a> email.
> +<pre>
> +    git show 162c1107a60e84c2e83db3e1e00f59c1b7f1a762
> +
> +    commit 162c1107a60e84c2e83db3e1e00f59c1b7f1a762
> +    Author: Jonas Pfeil &ltpfeiljonas at gmx.de&gt
> +    Date:   Wed Mar 1 18:11:10 2017 +0100
> +
> +        ralloc: Make sure ralloc() allocations match malloc()'s alignment.
> +
> +        The header of ralloc needs to be aligned, because the compiler assumes
> +        ...
> +
> +        (cherry picked from commit cd2b55e536dc806f9358f71db438dd9c246cdb14)
> +
> +        Squashed with commit:
> +
> +        ralloc: don't leave out the alignment factor
> +
> +        Experimentation shows that without alignment factor gcc and clang choose
> +        ...
> +
> +        (cherry picked from commit ff494fe999510ea40e3ed5827e7818550b6de126)
> +</pre>
> +</p>
>  
>  <h2>Regression/functionality testing</h2>
>  
> @@ -290,6 +322,12 @@ Queued (NUMBER)
>  AUTHOR (NUMBER):
>        COMMIT SUMMARY
>  
> +For example:
> +
> +Jonas Pfeil (1):
> +      ralloc: Make sure ralloc() allocations match malloc()'s alignment.
> +Squashed with
> +      ralloc: don't leave out the alignment factor
>  
>  Rejected (NUMBER)
>  =================
> -- 
> 2.11.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev