dim: stop adding Daniel's signed-off-by to driver date updates
PATCH 1/5 dim: stop adding Daniel's signed-off-by to driver date updates
git commit -s option should DTRT.
--- dim | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
dim +1 -2
@@ -1522,8 +1522,7 @@ function dim_update_next $DRY sed -i -e "s/^#define DRIVER_DATE.*\"[0-9]*\"$/#define DRIVER_DATE\t\t\"$driver_date\"/; s/^#define DRIVER_TIMESTAMP.*/#define DRIVER_TIMESTAMP\t$driver_timestamp/" \ drivers/gpu/drm/i915/i915_drv.h $DRY git add drivers/gpu/drm/i915/i915_drv.h - echo -e "drm/i915: Update DRIVER_DATE to $driver_date\n\nSigned-off-by: Daniel Vetter <[email protected]>" | \ - git commit -s -F - + git commit $DRY_RUN -sm "drm/i915: Update DRIVER_DATE to $driver_date" gitk drm-intel-next-queued ^$(url_to_remote $drm_upstream_git)/drm-next &
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/5 dim: use git format-patch style for *** REMINDERS ***
git format-patch adds *** SUBJECT HERE *** and similar to remind about things that need to be filled in. Follow suit.
--- dim | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
dim +3 -5
@@ -887,9 +887,7 @@ function dim_backmerge cat > $patch_file <<-HERE Merge $upstream into $branch - <Explain here why you've done the backmerge, e.g. which patches - or which driver pull request you need to be able to merge - \$feature_work from \$author.> + *** DETAILED BACKMERGE RATIONALE HERE *** HERE
@@ -1426,7 +1424,7 @@ function prep_pull_mail_overview local obj if [ "$#" = "0" ]; then - echo "*** insert pull request overview here ***" + echo "*** PULL REQUEST OVERVIEW HERE ***" else for tag in "$@"; do obj=$(git rev-parse $tag)
@@ -1566,7 +1564,7 @@ function dim_update_next_continue if [[ "$(git cat-file -t $obj)" == "tag" ]] ; then git cat-file -p $obj | tail -n+6 >> $req_file else - echo "<tag doesn't contain a changelog overview, fix this>" >> $req_file + echo "*** CHANGELOG OVERVIEW HERE ***" >> $req_file fi cat >> $req_file <<-HERE
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 dim: remove defaults from pull mail hello/signature
In reply to Jani NikulaHistorical baggage from the times this was just Daniel's maintainer script.
--- dim | 12 ------------ 1 file changed, 12 deletions(-)
dim +0 -12
@@ -1395,11 +1395,6 @@ function prep_pull_mail_greetings { if [ -r $DIM_TEMPLATE_HELLO ]; then cat $DIM_TEMPLATE_HELLO - else - cat <<-EOF - Hi Dave, - - EOF fi }
@@ -1407,13 +1402,6 @@ function prep_pull_mail_signature { if [ -r $DIM_TEMPLATE_SIGNATURE ]; then cat $DIM_TEMPLATE_SIGNATURE - else - cat <<-EOF - - Cheers, Daniel - - - EOF fi }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [maintainer-tools PATCH 3/5] dim: remove defaults from pull mail hello/signature
Quoted 26 lines · Jani Nikula
Historical baggage from the times this was just Daniel's maintainer script.
Cc Daniel Vetter <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- dim | 12 ------------ 1 file changed, 12 deletions(-)dim +0
-5@@ -1395,11 +1395,6 @@ function prep_pull_mail_greetings { if [ -r $DIM_TEMPLATE_HELLO ]; then cat $DIM_TEMPLATE_HELLO - else - cat <<-EOF - Hi Dave, - - EOF fi }
dim function prep_pull_mail_signature · line 1404
Quoted 3 lines
dim +0
-0@@ -1407,13 +1402,6 @@ function prep_pull_mail_signature { if [ -r $DIM_TEMPLATE_SIGNATURE ]; then cat $DIM_TEMPLATE_SIGNATURE
This template signature didn't work for me with "," on it... how do you use it?
Btw Acked-by on the whole series...
dim function prep_pull_mail_signature · line 1407
Quoted 10 lines
dim +0
-7- else - cat <<-EOF - - Cheers, Daniel - - - EOF fi }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [maintainer-tools PATCH 3/5] dim: remove defaults from pull mail hello/signature
Quoted 26 lines · Rodrigo
Quoted 25 lines · Jani Nikula
Historical baggage from the times this was just Daniel's maintainer script.
Cc Daniel Vetter <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- dim | 12 ------------ 1 file changed, 12 deletions(-)dim +0
-5@@ -1395,11 +1395,6 @@ function prep_pull_mail_greetings { if [ -r $DIM_TEMPLATE_HELLO ]; then cat $DIM_TEMPLATE_HELLO - else - cat <<-EOF - Hi Dave, - - EOF fi }
Quoted 7 lines
dim function prep_pull_mail_signature · line 1404
Quoted 4 lines
dim +0
-0@@ -1407,13 +1402,6 @@ function prep_pull_mail_signature { if [ -r $DIM_TEMPLATE_SIGNATURE ]; then cat $DIM_TEMPLATE_SIGNATUREThis template signature didn't work for me with "," on it... how do you use it?
I just have the signature in the file ~/.dim.template.signature which is the default. But you should be able to use your own location too. Just make sure it's an absolute path, using $HOME or something.
BR,
Jani.
Quoted 14 lines
Btw Acked-by on the whole series...
Quoted 10 lines
dim +0
-7- else - cat <<-EOF - - Cheers, Daniel - - - EOF fi }
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 dim: reuse pull request signature for drm-intel-testing mails
In reply to Jani NikulaI think adding a new config for this would be overkill, and this is bound to be more correct than "Cheers, Daniel".
Leave the generic "Hi all" salute in place though.
--- dim | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
dim +1 -6
@@ -1554,12 +1554,7 @@ function dim_update_next_continue else echo "*** CHANGELOG OVERVIEW HERE ***" >> $req_file fi - cat >> $req_file <<-HERE - - Happy testing! - - Cheers, Daniel - HERE + prep_pull_mail_signature >> $req_file $DRY $DIM_MUA -s "Updated drm-intel-testing" \ -i $req_file \
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 dim: update pull and test request recipients
In reply to Jani NikulaMake it easier to add/remove people as needed. Add Joonas, Rodrigo and Sean as new recipients for pull requests. Replace Daniel with Joonas and Rodrigo as test request recipients.
Perhaps we'll want to make the list branch specific in the future, but get the low hanging fruit first.
--- dim | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-)
dim +23 -18
@@ -83,13 +83,27 @@ drm_tip_ssh=ssh://git.freedesktop.org/git/drm-tip drm_upstream_git=git://people.freedesktop.org/~airlied/linux linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git -# email aliases -addr_drm_maintainer="Dave Airlie <[email protected]>" -addr_intel_gfx_maintainer1="Daniel Vetter <[email protected]>" -addr_intel_gfx_maintainer2="Jani Nikula <[email protected]>" -addr_intel_gfx="[email protected]" -addr_dri_devel="[email protected]" -addr_intel_qa="\"Jari Tahvanainen\" <[email protected]>" +# Recipients for all dim based pull requests. +# Add To: lines to the end, Cc: lines in the beginning with -c. +pull_request_recipients=( + -c "Daniel Vetter <[email protected]>" + -c "Jani Nikula <[email protected]>" + -c "Joonas Lahtinen <[email protected]>" + -c "Rodrigo Vivi <[email protected]>" + -c "Sean Paul <[email protected]>" + -c "[email protected]" + -c "[email protected]" + "Dave Airlie <[email protected]>" +) + +# Recipients for drm-intel-testing updates. +test_request_recipients=( + -c "Jani Nikula <[email protected]>" + -c "Joonas Lahtinen <[email protected]>" + -c "Rodrigo Vivi <[email protected]>" + -c "[email protected]" + "Jari Tahvanainen <[email protected]>" +) # integration configuration integration_config=nightly.conf
@@ -1557,11 +1571,7 @@ function dim_update_next_continue prep_pull_mail_signature >> $req_file $DRY $DIM_MUA -s "Updated drm-intel-testing" \ - -i $req_file \ - -c "$addr_intel_gfx" \ - -c "$addr_intel_gfx_maintainer1" \ - -c "$addr_intel_gfx_maintainer2" \ - "$addr_intel_qa" + -i $req_file "${test_request_recipients[@]}" } function dim_tag_next
@@ -1652,12 +1662,7 @@ function dim_pull_request git request-pull $upstream $git_url $tag >> $req_file $DRY $DIM_MUA -s "[PULL] $branch" \ - -i $req_file \ - -c "$addr_intel_gfx" \ - -c "$addr_dri_devel" \ - -c "$addr_intel_gfx_maintainer1" \ - -c "$addr_intel_gfx_maintainer2" \ - "$addr_drm_maintainer" + -i $req_file "${pull_request_recipients[@]}" } function dim_pull_request_next
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [maintainer-tools PATCH 5/5] dim: update pull and test request recipients
Quoted 11 lines · Jani Nikula
Make it easier to add/remove people as needed. Add Joonas, Rodrigo and Sean as new recipients for pull requests. Replace Daniel with Joonas and Rodrigo as test request recipients.
Perhaps we'll want to make the list branch specific in the future, but get the low hanging fruit first.
Cc Daniel Vetter <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Sean Paul <[email protected]>
Hi Jani,
For the entire series:
I'll have to add default signatures now :/)
Quoted 72 lines
Signed-off-by Jani Nikula <[email protected]>--- dim | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-)dim +23
-19@@ -83,13 +83,27 @@ drm_tip_ssh=ssh://git.freedesktop.org/git/drm-tip drm_upstream_git=git://people.freedesktop.org/~airlied/linux linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git -# email aliases -addr_drm_maintainer="Dave Airlie <[email protected]>" -addr_intel_gfx_maintainer1="Daniel Vetter <[email protected]>" -addr_intel_gfx_maintainer2="Jani Nikula <[email protected]>" -addr_intel_gfx="[email protected]" -addr_dri_devel="[email protected]" -addr_intel_qa="\"Jari Tahvanainen\" <[email protected]>" +# Recipients for all dim based pull requests. +# Add To: lines to the end, Cc: lines in the beginning with -c. +pull_request_recipients=( + -c "Daniel Vetter <[email protected]>" + -c "Jani Nikula <[email protected]>" + -c "Joonas Lahtinen <[email protected]>" + -c "Rodrigo Vivi <[email protected]>" + -c "Sean Paul <[email protected]>" + -c "[email protected]" + -c "[email protected]" + "Dave Airlie <[email protected]>" +) + +# Recipients for drm-intel-testing updates. +test_request_recipients=( + -c "Jani Nikula <[email protected]>" + -c "Joonas Lahtinen <[email protected]>" + -c "Rodrigo Vivi <[email protected]>" + -c "[email protected]" + "Jari Tahvanainen <[email protected]>" +) # integration configuration integration_config=nightly.conf@@ -1557,11 +1571,7 @@ function dim_update_next_continue prep_pull_mail_signature >> $req_file $DRY $DIM_MUA -s "Updated drm-intel-testing" \ - -i $req_file \ - -c "$addr_intel_gfx" \ - -c "$addr_intel_gfx_maintainer1" \ - -c "$addr_intel_gfx_maintainer2" \ - "$addr_intel_qa" + -i $req_file "${test_request_recipients[@]}" } function dim_tag_next@@ -1652,12 +1662,7 @@ function dim_pull_request git request-pull $upstream $git_url $tag >> $req_file $DRY $DIM_MUA -s "[PULL] $branch" \ - -i $req_file \ - -c "$addr_intel_gfx" \ - -c "$addr_dri_devel" \ - -c "$addr_intel_gfx_maintainer1" \ - -c "$addr_intel_gfx_maintainer2" \ - "$addr_drm_maintainer" + -i $req_file "${pull_request_recipients[@]}" } function dim_pull_request_next --
Quoted 2 lines
2.11.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [maintainer-tools PATCH 5/5] dim: update pull and test request recipients
Quoted 13 lines · Sean Paul
Quoted 11 lines · Jani Nikula
Make it easier to add/remove people as needed. Add Joonas, Rodrigo and Sean as new recipients for pull requests. Replace Daniel with Joonas and Rodrigo as test request recipients.
Perhaps we'll want to make the list branch specific in the future, but get the low hanging fruit first.
Cc Daniel Vetter <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Sean Paul <[email protected]>
Quoted 5 lines
Hi Jani,
For the entire series:I'll have to add default signatures now :/)
Thanks, pushed. You don't have to add signatures... you'll just get none instead of Daniel's signature. ;)
BR,
Jani.
Quoted 77 lines
Quoted 77 lines
Signed-off-by Jani Nikula <[email protected]>--- dim | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-)dim +23
-19@@ -83,13 +83,27 @@ drm_tip_ssh=ssh://git.freedesktop.org/git/drm-tip drm_upstream_git=git://people.freedesktop.org/~airlied/linux linux_upstream_git=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git -# email aliases -addr_drm_maintainer="Dave Airlie <[email protected]>" -addr_intel_gfx_maintainer1="Daniel Vetter <[email protected]>" -addr_intel_gfx_maintainer2="Jani Nikula <[email protected]>" -addr_intel_gfx="[email protected]" -addr_dri_devel="[email protected]" -addr_intel_qa="\"Jari Tahvanainen\" <[email protected]>" +# Recipients for all dim based pull requests. +# Add To: lines to the end, Cc: lines in the beginning with -c. +pull_request_recipients=( + -c "Daniel Vetter <[email protected]>" + -c "Jani Nikula <[email protected]>" + -c "Joonas Lahtinen <[email protected]>" + -c "Rodrigo Vivi <[email protected]>" + -c "Sean Paul <[email protected]>" + -c "[email protected]" + -c "[email protected]" + "Dave Airlie <[email protected]>" +) + +# Recipients for drm-intel-testing updates. +test_request_recipients=( + -c "Jani Nikula <[email protected]>" + -c "Joonas Lahtinen <[email protected]>" + -c "Rodrigo Vivi <[email protected]>" + -c "[email protected]" + "Jari Tahvanainen <[email protected]>" +) # integration configuration integration_config=nightly.conf@@ -1557,11 +1571,7 @@ function dim_update_next_continue prep_pull_mail_signature >> $req_file $DRY $DIM_MUA -s "Updated drm-intel-testing" \ - -i $req_file \ - -c "$addr_intel_gfx" \ - -c "$addr_intel_gfx_maintainer1" \ - -c "$addr_intel_gfx_maintainer2" \ - "$addr_intel_qa" + -i $req_file "${test_request_recipients[@]}" } function dim_tag_next@@ -1652,12 +1662,7 @@ function dim_pull_request git request-pull $upstream $git_url $tag >> $req_file $DRY $DIM_MUA -s "[PULL] $branch" \ - -i $req_file \ - -c "$addr_intel_gfx" \ - -c "$addr_dri_devel" \ - -c "$addr_intel_gfx_maintainer1" \ - -c "$addr_intel_gfx_maintainer2" \ - "$addr_drm_maintainer" + -i $req_file "${pull_request_recipients[@]}" } function dim_pull_request_next --2.11.0
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx