From 56c7ddc1381a56612018b75a848169b917bc33fb Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Sat, 30 Jun 2018 00:10:43 +0100 Subject: [PATCH] doc: add default that all fixes should be backported 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 Acked-by: Luca Boccassi Acked-by: Aaron Conole Acked-by: Thomas Monjalon --- 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 0f2f1f375a..f66e56224b 100644 --- a/doc/guides/contributing/stable.rst +++ b/doc/guides/contributing/stable.rst @@ -57,7 +57,25 @@ that a tagged release has been tested. 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 + + +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 limited cases, to back port features for the LTS release where: -- 2.20.1