[PATCH] doc: advise to specify LTS branch when backporting patches

[PATCH] doc: advise to specify LTS branch when backporting patches

[luca.boccassi]

From: Luca Boccassi <bluca@debian.org>

We have many stable branches being maintaned at the same time, and
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 stable@dpdk.org, not dev@dpdk.org.

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 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 ``stable@dpdk.org``, not to ``dev@dpdk.org``.
+
+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' ...``
+
+
 The Review Process
 ------------------
 
-- 
2.14.2

Re: [PATCH] doc: advise to specify LTS branch when backporting patches

[Kevin Traynor]

On 05/16/2018 03:31 PM, luca.boccassi@gmail.com wrote:
> From: Luca Boccassi <bluca@debian.org>
> 
> 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 stable@dpdk.org, not dev@dpdk.org.
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
>  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 ``stable@dpdk.org``, not to ``dev@dpdk.org``.
> +
> +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' ?

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 <ktraynor@redhat.com>

> +
>  The Review Process
>  ------------------
>  
> 

Re: [PATCH] doc: advise to specify LTS branch when backporting patches

[Luca Boccassi]

On Wed, 2018-05-16 at 16:19 +0100, Kevin Traynor wrote:
> On 05/16/2018 03:31 PM, luca.boccassi@gmail.com wrote:
> > From: Luca Boccassi <bluca@debian.org>
> > 
> > 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 stable@dpdk.org, not dev@dpdk.org.
> > 
> > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > ---
> >  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 ``stable@dpdk.org``, not to ``
> > dev@dpdk.org``.
> > +
> > +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 <ktraynor@redhat.com>

Makes sense, I've slightly re-arranged to wording for that

-- 
Kind regards,
Luca Boccassi

[PATCH v2] doc: advise to specify LTS branch when backporting patches

[luca.boccassi]

From: Luca Boccassi <bluca@debian.org>

We have many stable branches being maintained at the same time, and
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 stable@dpdk.org, not dev@dpdk.org.

Signed-off-by: Luca Boccassi <bluca@debian.org>
---

v2: hint that --subject-prefix is required, fix typos

 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..47c41288e 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 ``stable@dpdk.org``, not to ``dev@dpdk.org``.
+
+Given that there are multiple stable releases being maintained at the same time, please specify exactly which branch(es) the patch is for using ``git send-email --subject-prefix='16.11' ...`` and also optionally in the cover letter or in the annotation.
+
+
 The Review Process
 ------------------
 
-- 
2.14.2

Re: [PATCH v2] doc: advise to specify LTS branch when backporting patches

[Kevin Traynor]

On 05/16/2018 06:05 PM, luca.boccassi@gmail.com wrote:
> From: Luca Boccassi <bluca@debian.org>
> 
> We have many stable branches being maintained at the same time, and
> 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 stable@dpdk.org, not dev@dpdk.org.
> 

Acked-by: Kevin Traynor <ktraynor@redhat.com>

> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
> 
> v2: hint that --subject-prefix is required, fix typos
> 
>  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..47c41288e 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 ``stable@dpdk.org``, not to ``dev@dpdk.org``.
> +
> +Given that there are multiple stable releases being maintained at the same time, please specify exactly which branch(es) the patch is for using ``git send-email --subject-prefix='16.11' ...`` and also optionally in the cover letter or in the annotation.
> +
> +
>  The Review Process
>  ------------------
>  
> 

Re: [PATCH] doc: advise to specify LTS branch when backporting patches

[Thomas Monjalon]

16/05/2018 19:03, Luca Boccassi:
> On Wed, 2018-05-16 at 16:19 +0100, Kevin Traynor wrote:
> > On 05/16/2018 03:31 PM, luca.boccassi@gmail.com wrote:
> > > From: Luca Boccassi <bluca@debian.org>
> > > 
> > > 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 stable@dpdk.org, not dev@dpdk.org.
> > > 
> > > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > > ---
> > >  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 ``stable@dpdk.org``, not to ``
> > > dev@dpdk.org``.
> > > +
> > > +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 think it should be --subject-prefix='PATCH 16.11'

Please wrap the lines after some punctuation signs to avoid really long lines
in the rst file.

[PATCH v3] doc: advise to specify LTS branch when backporting patches

[luca.boccassi]

From: Luca Boccassi <bluca@debian.org>

We have many stable branches being maintained at the same time, and
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 stable@dpdk.org, not dev@dpdk.org.

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
v3: break long lines, fix subject-prefix argument to include PATH

v2: hint that --subject-prefix is required, fix typos

 doc/guides/contributing/patches.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index 2287835f9..c077e341a 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -450,6 +450,18 @@ 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 ``stable@dpdk.org``,
+not to ``dev@dpdk.org``.
+
+Given that there are multiple stable releases being maintained at the same time, please specify
+exactly which branch(es) the patch is for using ``git send-email --subject-prefix='PATCH 16.11' ...``
+and also optionally in the cover letter or in the annotation.
+
+
 The Review Process
 ------------------
 
-- 
2.14.2

Re: [PATCH] doc: advise to specify LTS branch when backporting patches

[Luca Boccassi]

On Thu, 2018-05-17 at 15:12 +0200, Thomas Monjalon wrote:
> 16/05/2018 19:03, Luca Boccassi:
> > On Wed, 2018-05-16 at 16:19 +0100, Kevin Traynor wrote:
> > > On 05/16/2018 03:31 PM, luca.boccassi@gmail.com wrote:
> > > > From: Luca Boccassi <bluca@debian.org>
> > > > 
> > > > 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 stable@dpdk.org, not dev@dpdk.org.
> > > > 
> > > > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > > > ---
> > > >  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 ``stable@dpdk.org``, not
> > > > to ``
> > > > dev@dpdk.org``.
> > > > +
> > > > +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 think it should be --subject-prefix='PATCH 16.11'
> 
> Please wrap the lines after some punctuation signs to avoid really
> long lines
> in the rst file.

Ok, done both in v3.

-- 
Kind regards,
Luca Boccassi

Re: [PATCH v3] doc: advise to specify LTS branch when backporting patches

[Thomas Monjalon]

17/05/2018 15:53, luca.boccassi@gmail.com:
> From: Luca Boccassi <bluca@debian.org>
> 
> We have many stable branches being maintained at the same time, and
> 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 stable@dpdk.org, not dev@dpdk.org.
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>

Acked-by: Thomas Monjalon <thomas@monjalon.net>

Applied, thanks