From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luca Boccassi Subject: Re: [PATCH] doc: advise to specify LTS branch when backporting patches Date: Wed, 16 May 2018 18:03:09 +0100 Message-ID: <1526490189.23337.129.camel@debian.org> References: <20180516143134.24838-1-luca.boccassi@gmail.com> <7a747fd8-174c-9c10-b9ab-ed0d74555844@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Cc: yliu@fridaylinux.org, thomas@monjalon.net To: Kevin Traynor , dev@dpdk.org Return-path: Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id 6F77DD0B8 for ; Wed, 16 May 2018 19:03:12 +0200 (CEST) Received: by mail-wr0-f193.google.com with SMTP id q3-v6so2230488wrj.6 for ; Wed, 16 May 2018 10:03:12 -0700 (PDT) In-Reply-To: <7a747fd8-174c-9c10-b9ab-ed0d74555844@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" On Wed, 2018-05-16 at 16:19 +0100, Kevin Traynor wrote: > On 05/16/2018 03:31 PM, luca.boccassi@gmail.com wrote: > > From: Luca Boccassi > >=20 > > We have many stable branches being maintaned at the same time, and >=20 > typo >=20 > > sometimes it's not clear which branch a patch is being backported > > for. > > Note in the guidelines that it should be specified via the cover > > letter, > > annotation or using --subject-prefix. > > Also note to send only to stable@dpdk.org, not dev@dpdk.org. > >=20 > > Signed-off-by: Luca Boccassi > > --- > > =C2=A0doc/guides/contributing/patches.rst | 8 ++++++++ > > =C2=A01 file changed, 8 insertions(+) > >=20 > > diff --git a/doc/guides/contributing/patches.rst > > b/doc/guides/contributing/patches.rst > > index 2287835f9..1dc623a23 100644 > > --- a/doc/guides/contributing/patches.rst > > +++ b/doc/guides/contributing/patches.rst > > @@ -450,6 +450,14 @@ Experienced committers may send patches > > directly with ``git send-email`` without > > =C2=A0The options ``--annotate`` and ``confirm =3D always`` are > > recommended for checking patches before sending. > > =C2=A0 > > =C2=A0 > > +Backporting patches for Stable Releases > > +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > + > > +Sometimes a maintainer or contributor wishes, or can be asked, to > > send a patch for a stable release rather than mainline. In this > > case the patch(es) should be sent to ``stable@dpdk.org``, not to `` > > dev@dpdk.org``. > > + > > +Given that there are multiple stable releases being maintained at > > the same time, please specify exactly which branch the patch is for > > in the cover letter, in the annotation or using ``git send-email -- > > subject-prefix=3D'16.11' ...`` > > + >=20 > s/branch/branch(es)/ >=20 > How about [16.11] instead of '16.11' ? Using --subject-prefix git will already use "[PATCH 16.11] > I would be in favour that the prefix(es) should always be added for > this > very specific case, as it will make it stand out more. >=20 > either way, > Acked-by: Kevin Traynor Makes sense, I've slightly re-arranged to wording for that --=20 Kind regards, Luca Boccassi