From patchwork Fri Jun 29 21:47:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 42010 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B6C001B902; Fri, 29 Jun 2018 23:47:52 +0200 (CEST) Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by dpdk.org (Postfix) with ESMTP id 584CF1B750 for ; Fri, 29 Jun 2018 23:47:51 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CADB1818533A; Fri, 29 Jun 2018 21:47:50 +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 990422026D68; Fri, 29 Jun 2018 21:47:48 +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: Fri, 29 Jun 2018 22:47:31 +0100 Message-Id: <1530308851-30496-1-git-send-email-ktraynor@redhat.com> In-Reply-To: <1529596827-14756-1-git-send-email-ktraynor@redhat.com> References: <1529596827-14756-1-git-send-email-ktraynor@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 29 Jun 2018 21:47:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 29 Jun 2018 21:47:50 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ktraynor@redhat.com' RCPT:'' Subject: [dpdk-dev] [PATCH v2] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/guides/contributing/stable.rst b/doc/guides/contributing/stable.rst index 0f2f1f3..c8c6058 100644 --- a/doc/guides/contributing/stable.rst +++ b/doc/guides/contributing/stable.rst @@ -58,5 +58,8 @@ 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 Fixes tags 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. Features should not be backported to stable releases. It may be acceptable, in @@ -77,5 +80,6 @@ list. All fix patches to the master branch that are candidates for backporting should also be CCed to the `stable@dpdk.org `_ -mailing list. +mailing list. Absence of this CC is an indication that the patch is not suitable +for backporting.