patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: dpdk stable <stable@dpdk.org>
Cc: Luca Boccassi <luca.boccassi@microsoft.com>,
	Kevin Traynor <ktraynor@redhat.com>,
	Christian Ehrhardt <christian.ehrhardt@canonical.com>
Subject: [dpdk-stable] [PATCH 1/3] 3-request-backport: add hint to QUEUED_REPO
Date: Thu,  4 Feb 2021 13:09:01 +0100	[thread overview]
Message-ID: <20210204120903.2515011-1-christian.ehrhardt@canonical.com> (raw)

When we ask for backports the code that we get sent might match latest
dpdk.org:dpdk-stable.git but not our WIP branch.

To mimimize any errors that arise out of that hint at the QUEUED_REPO
int he call for backport-help.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
 3-request-backport | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/3-request-backport b/3-request-backport
index 5749e26..d123531 100755
--- a/3-request-backport
+++ b/3-request-backport
@@ -61,7 +61,20 @@ Can authors check your patches in the following list and either:
 
 Please do either of the above by $(date --date="+7 days" "+%D").
 
+EOF
+
+if [ "$QUEUED_REPO" != "none" ]; then
+	cat << EOF
+You can find the a temporary work-in-progress branch of the coming $stable_release
+release at:
+    ${QUEUED_REPO}
+It is recommended to backport on top of that to minimize further conflicts or
+misunderstandings.
+
+EOF
+fi
 
+cat << EOF
 Some notes on $(stable_or_lts) backports:
 
 A backport should contain a reference to the DPDK main branch commit
-- 
2.30.0


             reply	other threads:[~2021-02-04 12:09 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-04 12:09 Christian Ehrhardt [this message]
2021-02-04 12:09 ` [dpdk-stable] [PATCH 2/3] README: add hint on git send-email vs flooding protection Christian Ehrhardt
2021-02-04 12:26   ` Luca Boccassi
2021-02-04 13:29   ` Kevin Traynor
2021-02-04 12:09 ` [dpdk-stable] [PATCH 3/3] README: add hint on chaining multiple series submissions Christian Ehrhardt
2021-02-04 12:27   ` Luca Boccassi
2021-02-04 13:30   ` Kevin Traynor
2021-02-04 12:26 ` [dpdk-stable] [PATCH 1/3] 3-request-backport: add hint to QUEUED_REPO Luca Boccassi
2021-02-04 13:30 ` Kevin Traynor

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=20210204120903.2515011-1-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=ktraynor@redhat.com \
    --cc=luca.boccassi@microsoft.com \
    --cc=stable@dpdk.org \
    /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).