On Wed, 2018-05-16 at 16:19 +0100, Kevin Traynor wrote: > On 05/16/2018 03:31 PM, [email protected] wrote: > > From: Luca Boccassi <[email protected]> > > > > We have many stable branches being maintaned at the same time, and > > typo > > > sometimes it's not clear which branch a patch is being backported > > for. > > Note in the guidelines that it should be specified via the cover > > letter, > > annotation or using --subject-prefix. > > Also note to send only to [email protected], not [email protected]. > > > > Signed-off-by: Luca Boccassi <[email protected]> > > --- > > doc/guides/contributing/patches.rst | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/doc/guides/contributing/patches.rst > > b/doc/guides/contributing/patches.rst > > index 2287835f9..1dc623a23 100644 > > --- a/doc/guides/contributing/patches.rst > > +++ b/doc/guides/contributing/patches.rst > > @@ -450,6 +450,14 @@ Experienced committers may send patches > > directly with ``git send-email`` without > > The options ``--annotate`` and ``confirm = always`` are > > recommended for checking patches before sending. > > > > > > +Backporting patches for Stable Releases > > +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > + > > +Sometimes a maintainer or contributor wishes, or can be asked, to > > send a patch for a stable release rather than mainline. In this > > case the patch(es) should be sent to ``[email protected]``, not to `` > > [email protected]``. > > + > > +Given that there are multiple stable releases being maintained at > > the same time, please specify exactly which branch the patch is for > > in the cover letter, in the annotation or using ``git send-email -- > > subject-prefix='16.11' ...`` > > + > > s/branch/branch(es)/ > > How about [16.11] instead of '16.11' ?
Using --subject-prefix git will already use "[PATCH 16.11] > I would be in favour that the prefix(es) should always be added for > this > very specific case, as it will make it stand out more. > > either way, > Acked-by: Kevin Traynor <[email protected]> Makes sense, I've slightly re-arranged to wording for that -- Kind regards, Luca Boccassi
