[RFC] dim: drm-intel: Include drm-intel-gt-next as part of unified fixes flow

Jani Nikula jani.nikula at linux.intel.com
Wed Sep 30 09:30:57 UTC 2020


On Wed, 30 Sep 2020, Jani Nikula <jani.nikula at linux.intel.com> wrote:
> On Tue, 29 Sep 2020, Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
>> This is the minimal and more straight forward way to do it,
>> although I'm sure there are better ways.
>
> Hardly minimal?
>
> I think there's probably a magic git spell to list multiple branches to
> look for when passing the parameters to git_list_fixes.

This is the minimal fix.

BR,
Jani.


diff --git a/dim b/dim
index 3f489976c6bc..33e2400c32cc 100755
--- a/dim
+++ b/dim
@@ -1384,7 +1384,7 @@ function cherry_pick_branch
 	intel_remote=$(repo_to_remote drm-intel)
 
 	# Look for commits in dinq tagged as fixes.
-	for commit in $(git_list_fixes $intel_remote/$branch..$intel_remote/drm-intel-next-queued -- drivers/gpu/drm/i915); do
+	for commit in $(git_list_fixes $intel_remote/$branch..$intel_remote/drm-intel-next-queued $intel_remote/$branch..$intel_remote/drm-intel-gt-next -- drivers/gpu/drm/i915); do
 		echo -n "Considering $(dim_cite $commit)... "
 
 		# Look at history for already cherry-picked fixes.


-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the dim-tools mailing list