[dpdk-stable] [PATCH 1/2] compose-notice: update compose-notice text
Kevin Traynor
ktraynor at redhat.com
Fri Jun 21 16:40:14 CEST 2019
I got some feedback that it was confusing, so added a little
text to explicitly mention that changes would be from rebasing.
Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
---
compose-notice | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/compose-notice b/compose-notice
index 21cbc68..e44c738 100644
--- a/compose-notice
+++ b/compose-notice
@@ -43,7 +43,9 @@ It will be pushed if I get no objections before $(date --date="+2 days" "+%D").
shout if anyone has objections.
$(cat notice-more 2>/dev/null | grep -v "^#")
-Also note that after the patch there's a diff of the upstream commit vs the patch applied
-to the branch. If the code is different (ie: not only metadata diffs), due for example to
-a change in context or macro names, please double check it.
+Also note that after the patch there's a diff of the upstream commit vs the
+patch applied to the branch. This will indicate if there was any rebasing
+needed to apply to the stable branch. If there were code changes for rebasing
+(ie: not only metadata diffs), please double check that the rebase was
+correctly done.
EOF
--
2.20.1
More information about the stable
mailing list