From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by dpdk.org (Postfix) with ESMTP id 9E0EB1BE21 for ; Sat, 30 Jun 2018 01:10:49 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 057DA87A81; Fri, 29 Jun 2018 23:10:49 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-152.ams2.redhat.com [10.36.117.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0AE1111AF1C; Fri, 29 Jun 2018 23:10:46 +0000 (UTC) From: Kevin Traynor 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 Date: Sat, 30 Jun 2018 00:10:43 +0100 Message-Id: <1530313843-32721-1-git-send-email-ktraynor@redhat.com> In-Reply-To: <1530308851-30496-1-git-send-email-ktraynor@redhat.com> References: <1530308851-30496-1-git-send-email-ktraynor@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 29 Jun 2018 23:10:49 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 29 Jun 2018 23:10:49 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ktraynor@redhat.com' RCPT:'' Subject: [dpdk-dev] [PATCH v3] docs: add default that all fixes should be backported X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2018 23:10:49 -0000 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 --- 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 + + +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