Skip to contentSkip to conversation

dim: Update drm-tip in update-next

PATCH New Daniel Vetter 1 participant 2 messages Mar 20, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dim: Update drm-tip in update-next

The integration branch moved!

---
 dim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
dim +3 -2
index 64edcda83084..d8b190efe2de 100755
@@ -1291,13 +1291,14 @@ function dim_update_next
 	remote=`url_to_remote $drm_tip_ssh`
 
 	git pull --ff-only
+	git fetch drm-tip
 
 	if ! git branch --merged $remote/drm-tip | grep -q drm-intel-fixes ; then
-		echo "drm-intel-fixes not merged into -nigthly, please update!"
+		echo "drm-intel-fixes not merged into drm-tip, please update!"
 		exit 2
 	fi
 	if ! git branch --merged $remote/drm-tip | grep -q drm-intel-next-queued ; then
-		echo "drm-intel-next-queued not merged into -nigthly, please update!"
+		echo "drm-intel-next-queued not merged into drm-tip, please update!"
 		exit 2
 	fi
 
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 dim: Docs for Ville's tools

Cc Ville Syrjälä <[email protected]>
---
 dim.rst | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
dim.rst +30 -0
index a778701c7335..1bec3838bace 100644
@@ -182,6 +182,22 @@ apply-queued|aq [*git am arguments*]
 Applies a patch to -fixes, -next-fixes or -next-queued respectively, complains
 if it's not the right branch. Additional arguments are passed to git am.
 
+extract-tags *branch* [*git-rangeish*]
+--------------------------------------
+
+extract-queued [*git-rangeish*]
+-------------------------------
+
+extract-fixes [*git-rangeish*]
+------------------------------
+
+extract-next-fixes [*git-rangeish*]
+-----------------------------------
+
+This extracts various tags (eg. Reviwed-by:) from emails and applies them to the
+top commit on the given branch. You can give the comamnd a rangeish to add the
+tags from the same email to multiple already applied patches.
+
 magic-patch|mp [-a]
 -------------------
 Apply a patch using patch and then wiggle in any conflicts. When passing the
@@ -189,6 +205,20 @@ option -a automatically changes the working directory into the git repository
 used by the last previous branch-specific command. This is useful with the
 per-branch workdir model.
 
+add-link *branch*
+-----------------
+
+add-link-queued
+---------------
+
+add-link-fixes
+--------------
+
+add-link-next-fixes
+-------------------
+
+This command adds the Link: tag (for patches that failed to apply directly).
+
 magic-rebase-resolve|mrr
 ------------------------
 Tries to resolve a rebase conflict by first resetting the tree
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx