From: Kevin Traynor <ktraynor@redhat.com>
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
Subject: Re: [dpdk-dev] [PATCH] docs: add default that all fixes are backported
Date: Fri, 29 Jun 2018 22:39:24 +0100 [thread overview]
Message-ID: <3f70448c-9bd5-59b6-7231-3a747ec79062@redhat.com> (raw)
In-Reply-To: <17794913.e2HM90q5a3@xps>
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.
next prev parent reply other threads:[~2018-06-29 21:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-21 16:00 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 [this message]
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 ` [dpdk-dev] [PATCH v3] " Kevin Traynor
2018-07-04 15:22 ` 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=3f70448c-9bd5-59b6-7231-3a747ec79062@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).