From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: Re: [PATCH] docs: add default that all fixes are backported Date: Fri, 29 Jun 2018 23:56:40 +0200 Message-ID: <5332944.6YUZ7rFQxA@xps> References: <1529596827-14756-1-git-send-email-ktraynor@redhat.com> <17794913.e2HM90q5a3@xps> <3f70448c-9bd5-59b6-7231-3a747ec79062@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Cc: dev@dpdk.org, Ferruh Yigit , john.mcnamara@intel.com, bluca@debian.org, yskoh@mellanox.com, christian.ehrhardt@canonical.com, aconole@redhat.com To: Kevin Traynor Return-path: Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id CFC651B8BA for ; Fri, 29 Jun 2018 23:56:43 +0200 (CEST) In-Reply-To: <3f70448c-9bd5-59b6-7231-3a747ec79062@redhat.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 29/06/2018 23:39, Kevin Traynor: > 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 > >>> --- > >>> 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 :-) As maintainers, our role is to make sure the tag is not forgotten. We use the tool devtools/check-git-log.sh. > 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. Yes the most important is to explain the intent. Thanks