DPDK patches and discussions
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: john.mcnamara@intel.com, bluca@debian.org, yskoh@mellanox.com,
	christian.ehrhardt@canonical.com, ktraynor@redhat.com
Cc: dev@dpdk.org, thomas@monjalon.net, aconole@redhat.com,
	ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH v3] docs: add default that all fixes should be backported
Date: Sat, 30 Jun 2018 00:10:43 +0100	[thread overview]
Message-ID: <1530313843-32721-1-git-send-email-ktraynor@redhat.com> (raw)
In-Reply-To: <1530308851-30496-1-git-send-email-ktraynor@redhat.com>

Set the starting point that all commits on master branch
with Fixes tag should be backported to relevant stable/LTS
branches, and explain that the submitter may indicate it is
not suitable for backport.

Of course there will be exceptions that will crop up from time
to time that need discussion, so also add a sentence for that.

This is to ensure that there is consistency between what is
backported to stable/LTS branches, remove some subjectivity
as to what constitutes "a fix" and avoid possible conflicts
for future backports.

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
Acked-by: Luca Boccassi <bluca@debian.org>
Acked-by: Aaron Conole <aconole@redhat.com>
---
 doc/guides/contributing/stable.rst | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/guides/contributing/stable.rst b/doc/guides/contributing/stable.rst
index 0f2f1f3..f66e562 100644
--- a/doc/guides/contributing/stable.rst
+++ b/doc/guides/contributing/stable.rst
@@ -58,5 +58,23 @@ What changes should be backported
 ---------------------------------
 
-Backporting should be limited to bug fixes.
+Backporting should be limited to bug fixes. All patches accepted on the master
+branch with a Fixes: tag should be backported to the relevant stable/LTS
+branches, unless the submitter indicates otherwise. If there are exceptions,
+they will be discussed on the mailing lists.
+
+Fixes suitable for backport should have a ``Cc: stable@dpdk.org`` tag in the
+commit message body as follows::
+
+     doc: fix some parameter description
+
+     Update the docs, fixing description of some parameter.
+
+     Fixes: abcdefgh1234 ("doc: add some parameter")
+     Cc: stable@dpdk.org
+
+     Signed-off-by: Alex Smith <alex.smith@example.com>
+
+
+Fixes not suitable for backport should not include the ``Cc: stable@dpdk.org`` tag.
 
 Features should not be backported to stable releases. It may be acceptable, in
-- 
1.8.3.1

  parent reply	other threads:[~2018-06-29 23:10 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-21 16:00 [dpdk-dev] [PATCH] docs: add default that all fixes are backported Kevin Traynor
2018-06-21 16:14 ` Luca Boccassi
2018-06-21 16:45 ` Ferruh Yigit
2018-06-29 16:15   ` Thomas Monjalon
2018-06-29 21:39     ` Kevin Traynor
2018-06-29 21:56       ` Thomas Monjalon
2018-06-21 18:00 ` Aaron Conole
2018-06-29 21:47 ` [dpdk-dev] [PATCH v2] docs: add default that all fixes should be backported Kevin Traynor
2018-06-29 22:02   ` Thomas Monjalon
2018-06-29 23:15     ` Kevin Traynor
2018-06-29 23:10   ` Kevin Traynor [this message]
2018-07-04 15:22     ` [dpdk-dev] [PATCH v3] " Thomas Monjalon
2018-07-11 21:04       ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1530313843-32721-1-git-send-email-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=aconole@redhat.com \
    --cc=bluca@debian.org \
    --cc=christian.ehrhardt@canonical.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=john.mcnamara@intel.com \
    --cc=thomas@monjalon.net \
    --cc=yskoh@mellanox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).