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 B582BA0C47 for ; Tue, 10 Aug 2021 16:24:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D4DE4014F; Tue, 10 Aug 2021 16:24:47 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 142204014F for ; Tue, 10 Aug 2021 16:24:47 +0200 (CEST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 0567E40328 for ; Tue, 10 Aug 2021 14:24:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628605486; bh=yy78CvgPEmDLmydtOlG6qDCFn6xuPRtfwUwk2v0+EaY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=DGz5zVvk0BoLkKLfYvvdfA4Jp8tqzHH/F/SHn4YuvOhkQ7zr24+SPouzb0lMPNsYm zHBXivWQVqn+1uzQZwZjSKcY7EKy1g3kWDR+uZd6dwKJ5hTHhWPqJoG9mJpbJz5Q8P VYyGpqxFN4qQRQnXRH+ZBxSTFbACXDmG6ZYgXExtvmGQi00K4yGpWwULrtFWP//L36 6eQEyzN3OSYTkgZOEx4FsPMLfz/MbJw01k5U/uoUvqJrWDAaNfY+IQKsRSqXGzowG/ vL3kbhQhVOYS2nl0Feu7An6glMqlQPd6QRT4T3nl61Ms1jHNFYeZuNGfO5JV5BQv7p T2jZapyU60ECw== Received: by mail-ed1-f69.google.com with SMTP id de5-20020a0564023085b02903bb92fd182eso10932346edb.8 for ; Tue, 10 Aug 2021 07:24:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yy78CvgPEmDLmydtOlG6qDCFn6xuPRtfwUwk2v0+EaY=; b=XRZG6DeOW0c9D2e9h+JM9kqvATc/9Z9cfOnULDa1SToCzVToZLmgDRZSAKNVhnRV8y sj8Q9niKaJJqnsklSxwXa3anf4j5bHszXB9445Ola+XUukGtFuMhAQA5cSjT6QIbA5dA Yw7KzpNL7GOPJvdnuG0QQjXMFHIkH0BtRUZaxFympSzgQU5YHkZJtj7wh7+24klS4vGR mV2Z2HFMtMnopENR9+GJ8C9ENsdaIpyRO78zOWvzww7QkzzWCK4DpZ91B4maK4R1/Q7X Dn2daxBy4DrSOD1xx2nU79YBjTG1GVaYGhPqbRN6Gqa60nPGfMGi+ZnDb+JJcHiukOVt +a+w== X-Gm-Message-State: AOAM532OpBHV/Ku1Ca/f4gLNN/dyrIjiCtsNZgu9DNxPuhEQYm/kKOme MmvOvuOWm9bcAMZ6BHU6/oMhxoCQOSsAawh7WQZd0NR0zG84wSWn5zndrurRCtUIaApLDmN6nOA XfCwQARhoOO+atVslWv928x4s X-Received: by 2002:a17:906:4a46:: with SMTP id a6mr13235673ejv.252.1628605485496; Tue, 10 Aug 2021 07:24:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOTSs6m8s52h0ouRISk26ggDX6tGMdiflu39Tj43riDCQr87BW7OIZ2/Ix3SNI0RY1pAbZ0w== X-Received: by 2002:a17:906:4a46:: with SMTP id a6mr13235664ejv.252.1628605485321; Tue, 10 Aug 2021 07:24:45 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id p23sm9714477edw.94.2021.08.10.07.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 07:24:44 -0700 (PDT) From: christian.ehrhardt@canonical.com To: stable@dpdk.org, Thomas Monjalon , Luca Boccassi , Xueming Li Cc: Christian Ehrhardt Date: Tue, 10 Aug 2021 16:24:41 +0200 Message-Id: <20210810142442.727267-1-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [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" From: Christian Ehrhardt 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. Instead we should use $RTE_VER_MAJOR that will correctly select the branch name and therefore make 3-request-backport work in this case. Signed-off-by: Christian Ehrhardt --- 3-request-backport | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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=$(cat $_scripts_dir/$stable_release/tmp_import/list | tr '\n' ' ') _parent_commit_id=$(cat $_scripts_dir/$stable_release/parent_commit_id) - _applied=$(git log --oneline $_parent_commit_id..HEAD | cut -d\ -f2-) + _applied=$(git log --oneline $_parent_commit_id..$RTE_VER_MAJOR | cut -d\ -f2-) for _file in $list do _sub=$(grep Subject $_file | cut -d\ -f3-) -- 2.32.0