patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: stable@dpdk.org
Cc: bluca@debian.org, Kevin Traynor <ktraynor@redhat.com>
Subject: [dpdk-stable] [PATCH stable-scripts] Update to new DPDK branch names
Date: Tue,  1 Sep 2020 11:12:39 +0100	[thread overview]
Message-ID: <20200901101239.73322-1-ktraynor@redhat.com> (raw)

DPDK branch names in the dpdk.git repo have been updated.
Update email text and README to reflect the change.

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
---
 3-request-backport | 6 +++---
 README             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3-request-backport b/3-request-backport
index dadaf3e..5749e26 100755
--- a/3-request-backport
+++ b/3-request-backport
@@ -53,5 +53,5 @@ cat << EOF
 Hi commit authors (and maintainers),
 
-I didn't apply following commits from DPDK master to $stable_branch
+I didn't apply following commits from DPDK main to $stable_branch
 $(stable_or_lts) branch, as conflicts or build errors occur.
 
@@ -65,7 +65,7 @@ Please do either of the above by $(date --date="+7 days" "+%D").
 Some notes on $(stable_or_lts) backports:
 
-A backport should contain a reference to the DPDK master branch commit
+A backport should contain a reference to the DPDK main branch commit
 in it's commit message in the following fashion:
-    [ upstream commit <commit's dpdk master branch SHA-1 checksum> ]
+    [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]
 
 For example:
diff --git a/README b/README
index fdf61ab..3e4978a 100644
--- a/README
+++ b/README
@@ -81,5 +81,5 @@ This will create .patch files located in stable-scripts/<release>/mail which can
 then be sent with git send-email to the authors and stable@dpdk.org.
 
-As part of this email a diff is provided between the master and stable branch
+As part of this email a diff is provided between the main and stable branch
 patches. As there are diffs in the patches and diffs between the patches, it
 can be hard to see how the patch will look in the repo when there are rebase
-- 
2.26.2


             reply	other threads:[~2020-09-01 10:12 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-01 10:12 Kevin Traynor [this message]
2020-09-01 11:32 ` Luca Boccassi
2020-09-02  9:03   ` 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=20200901101239.73322-1-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=bluca@debian.org \
    --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).