From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ktraynor@redhat.com>
Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73])
by dpdk.org (Postfix) with ESMTP id 85C721BDF0
for <dev@dpdk.org>; Fri, 29 Jun 2018 23:39:29 +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 CAF237263A;
Fri, 29 Jun 2018 21:39:28 +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 BDAAC111AF1C;
Fri, 29 Jun 2018 21:39:25 +0000 (UTC)
To: Thomas Monjalon <thomas@monjalon.net>
Cc: dev@dpdk.org, Ferruh Yigit <ferruh.yigit@intel.com>,
john.mcnamara@intel.com, bluca@debian.org, yskoh@mellanox.com,
christian.ehrhardt@canonical.com, aconole@redhat.com
References: <1529596827-14756-1-git-send-email-ktraynor@redhat.com>
<b7f636a3-103d-dc94-1abb-55fbee347959@intel.com> <17794913.e2HM90q5a3@xps>
From: Kevin Traynor <ktraynor@redhat.com>
Organization: Red Hat
Message-ID: <3f70448c-9bd5-59b6-7231-3a747ec79062@redhat.com>
Date: Fri, 29 Jun 2018 22:39:24 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
Thunderbird/52.2.0
MIME-Version: 1.0
In-Reply-To: <17794913.e2HM90q5a3@xps>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
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.2]); Fri, 29 Jun 2018 21:39:28 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]);
Fri, 29 Jun 2018 21:39:28 +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: Re: [dpdk-dev] [PATCH] docs: add default that all fixes are
backported
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jun 2018 21:39:29 -0000
On 06/29/2018 05:15 PM, Thomas Monjalon wrote:
> 21/06/2018 18:45, Ferruh Yigit:
>> On 6/21/2018 5:00 PM, Kevin Traynor wrote:
>>> Set the starting point that all commits on master branch
>>> with Fixes tag are backported to relevant stable/LTS branches.
>>>
>>> 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>
>>> ---
>>> doc/guides/contributing/stable.rst | 4 +++-
>>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/doc/guides/contributing/stable.rst b/doc/guides/contributing/stable.rst
>>> index 0f2f1f3..bbafc37 100644
>>> --- a/doc/guides/contributing/stable.rst
>>> +++ b/doc/guides/contributing/stable.rst
>>> @@ -58,5 +58,7 @@ 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 will be backported to the relevant stable/LTS branches.
>>> +If there are exceptions, they will be discussed on the mailing lists.
>>
>> Just to highlight, there are some cased fix is not applicable for stable trees,
>> for that case "Cc: stable@dpdk.org" tag explicitly omitted.
>>
>> a) Fix with backport request:
>> Fixes: ############ ("...")
>> Cc: stable@dpdk.org
>>
>> b) Fix but backport not applicable/requested:
>> Fixes: ############ ("...")
>>
>>
>> So I agree there may be a confusion in b) if the backport is not requested or it
>> has been forgotten.
>> Is there anything we can do/change to help stable tree maintainers on this issue?
>
> I agree with Ferruh that fixes without Cc: stable@dpdk.org
> should not be backported, except if it is confirmed that it is a miss.
>
> Can we change the wording to "all patches with Cc: stable@dpdk.org tag" ?
>
>
I agree this case should be catered for. That approach will work fine as
long as most people remember the tags :-)
I reworded it a little bit differently to try and also keep the essence
that as many Fixes as possible should be backported. Otherwise devs may
use the Cc: stable@dpdk.org based on wildly different opinions about the
stable branches and what types of fixes are backported.
Aaron/Luca, I kept Acks because this is just adding for a special case.
Shout if any objection.