[dpdk-stable] [PATCH] 3-request-backport: Update email message
Kevin Traynor
ktraynor at redhat.com
Tue Aug 27 14:28:56 CEST 2019
Re-writing to make the actions required from authors
standout earlier in the message and add a target date,
so it's clear when the backports are needed for.
Also, updating some links and formats that have gone stale.
Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
---
3-request-backport | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/3-request-backport b/3-request-backport
index 62f6bf3..dadaf3e 100755
--- a/3-request-backport
+++ b/3-request-backport
@@ -53,29 +53,34 @@ cat << EOF
Hi commit authors (and maintainers),
-I didn't manage to apply following commits from upstream to stable branch
-$stable_branch: conflict happens. I'm wondering can the authors check the following
-list and backport those patches belong to you?
+I didn't apply following commits from DPDK master to $stable_branch
+$(stable_or_lts) branch, as conflicts or build errors occur.
-FYI, branch $stable_branch is located at tree:
- git://dpdk.org/dpdk-stable
+Can authors check your patches in the following list and either:
+ - Backport your patches to the $stable_branch branch, or
+ - Indicate that the patch should not be backported
-It'd be great if you could do that in one or two weeks. Also, please add a
-heading line like below before the commit log body:
- [ backported from upstream commit xxx ]
+Please do either of the above by $(date --date="+7 days" "+%D").
-Example: http://dpdk.org/browse/dpdk-stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e
-Also please mention the target $(stable_or_lts) in the subject line, as we have more than one
-at the same time, for example:
+Some notes on $(stable_or_lts) backports:
+A backport should contain a reference to the DPDK master branch commit
+in it's commit message in the following fashion:
+ [ upstream commit <commit's dpdk master branch SHA-1 checksum> ]
+
+For example:
+ https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb
+
+When sending the backported patch, please indicate the target branch in the
+subject line, as we have multiple branches, for example:
[PATCH $stable_branch] foo/bar: fix baz
-With git send-email, this can be achieved by appending the parameter:
+With git format-patch, this can be achieved by appending the parameter:
+ --subject-prefix='PATCH $stable_branch'
- --subject-prefix='$stable_branch'
+Send the backported patch to "stable at dpdk.org" but not "dev at dpdk.org".
-Please let me know if you have any comments, say, need more time, or it's
-worthless to packport it. And please send it to "stable at dpdk.org", but not
-"dev at dpdk.org".
+FYI, branch $stable_branch is located at tree:
+ https://git.dpdk.org/dpdk-stable
Thanks.
--
2.20.1
More information about the stable
mailing list