From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C3DD2A0C47 for ; Tue, 10 Aug 2021 18:57:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B71F14014F; Tue, 10 Aug 2021 18:57:53 +0200 (CEST) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 404524014F for ; Tue, 10 Aug 2021 18:57:52 +0200 (CEST) Received: by mail-wm1-f52.google.com with SMTP id l34-20020a05600c1d22b02902573c214807so2453473wms.2 for ; Tue, 10 Aug 2021 09:57:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=RxuWjg07SFcsn+h9xw1sx7jgMG7jtjgi1Z0vY5b2YJw=; b=X0yT3eH6yKWogkBMKVCG9AzUcsBvO4MA1p/iZ2AR5OIlgr6Hd5wbbhJAT4GMDn5NXX 7gy2NuBzzOUYxahBu492Xeu6PdjVlhvA3aHfECcEbmtJicNezTaSlP9WSyS/0k1wsQ9e 5W/oUaY3EACE0iNJH1cgHcuDhPRgEdkFfWgkaMbgcHUWupbcDBLKSgBkovcF8rKs9o0L iqOtHvTA+f4CwK0SItL1luCCASIwDnTMA0sa/YXixGc7O6x4L9myTyZ+vj0ii2z63V0l t+3FRPenejmz6uNSr7cY/ku+Vmvf3glRYD/G/0+VEbfIiSDtxjCEONfwtnA1LcMfUG+h kkUg== X-Gm-Message-State: AOAM533vGb/GQHfimW7AVvlizvH490216vgff6N5N5Es0mKDKgyEPHan i3N+5vg+/Hc3M7r1OuVp4nU= X-Google-Smtp-Source: ABdhPJwLqhrLvVNJKs0iTxohYSQIU/AQzjjuVcbf0c6xG/UWyLVIVa2+Yw4tmiFcl5ytLs11n3M5oA== X-Received: by 2002:a7b:c7da:: with SMTP id z26mr5751777wmk.147.1628614671998; Tue, 10 Aug 2021 09:57:51 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id d8sm24201457wrv.20.2021.08.10.09.57.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 09:57:51 -0700 (PDT) Message-ID: From: Luca Boccassi To: christian.ehrhardt@canonical.com, stable@dpdk.org, Thomas Monjalon , Xueming Li Date: Tue, 10 Aug 2021 17:57:50 +0100 In-Reply-To: <20210810142442.727267-1-christian.ehrhardt@canonical.com> References: <20210810142442.727267-1-christian.ehrhardt@canonical.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1.2 MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH 1/2] 3-request-backport: use history from stable branch X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Tue, 2021-08-10 at 16:24 +0200, christian.ehrhardt@canonical.com wrote: > From: Christian Ehrhardt >=20 > To select the proper maintainers - as of today - we recommend to check > out the main branch in $STABLE_DIR before calling 3-request-backport. > But due to that the range $_parent_commit_id..HEAD selects the wrong HEAD > and thereby does not find any applied patch. >=20 > Instead we should use $RTE_VER_MAJOR that will correctly select the > branch name and therefore make 3-request-backport work in this case. >=20 > Signed-off-by: Christian Ehrhardt > --- > 3-request-backport | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/3-request-backport b/3-request-backport > index a1725e5..67234d2 100755 > --- a/3-request-backport > +++ b/3-request-backport > @@ -11,7 +11,7 @@ then > pushd $STABLE_DIR &>/dev/null > list=3D$(cat $_scripts_dir/$stable_release/tmp_import/list | tr '\n' ' = ') > _parent_commit_id=3D$(cat $_scripts_dir/$stable_release/parent_commit_i= d) > - _applied=3D$(git log --oneline $_parent_commit_id..HEAD | cut -d\ -f2-= ) > + _applied=3D$(git log --oneline $_parent_commit_id..$RTE_VER_MAJOR | cut= -d\ -f2-) > for _file in $list > do > _sub=3D$(grep Subject $_file | cut -d\ -f3-) Acked-by: Luca Boccassi --=20 Kind regards, Luca Boccassi