[PATCH] doc: Emphasis that drm-tip is a shared tree

Joonas Lahtinen joonas.lahtinen at linux.intel.com
Wed Dec 13 13:29:32 UTC 2017


Put yellow highlight on drm-tip to point out that it is a shared
tree.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Cc: Jani Nikula <jani.nikula at linux.intel.com>
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 drm-intel-flow.dot | 12 +++++++-----
 drm-intel.rst      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drm-intel-flow.dot b/drm-intel-flow.dot
index 1be86164f5e0..ee44e8013e92 100644
--- a/drm-intel-flow.dot
+++ b/drm-intel-flow.dot
@@ -56,7 +56,6 @@ strict digraph "drm-intel" {
        "drm-intel-next" [color=blue]
        "drm-intel-next-fixes" [color=blue]
        "drm-intel-next-queued" [label="drm-intel-next-queued\ntopic/* branches" color=blue]
-       "drm-tip" [color=blue]
        "drm-intel-testing" [color=blue]
        "drm-intel-internal" [color=blue]
 
@@ -72,14 +71,17 @@ strict digraph "drm-intel" {
        "sound/for-linus" [color=yellow style=dashed]
        "sound/for-next" [color=yellow style=dashed]
 
+       # drm-tip
+       "drm-tip" [color=yellow]
+
        # nightly rebuild
        "drm-intel-fixes" -> "drm-tip" [label="rebuild" color=blue]
        "drm-intel-next-fixes" -> "drm-tip" [label="rebuild" color=blue]
        "drm-intel-next-queued" -> "drm-tip" [label="rebuild" color=blue]
-       "drm-next" -> "drm-tip" [label="rebuild" color=blue]
-       "drm-fixes" -> "drm-tip" [label="rebuild" color=blue]
-       "sound/for-next" -> "drm-tip" [label="rebuild" color=blue]
-       "sound/for-linus" -> "drm-tip" [label="rebuild" color=blue]
+       "drm-next" -> "drm-tip" [label="rebuild" color=yellow]
+       "drm-fixes" -> "drm-tip" [label="rebuild" color=yellow]
+       "sound/for-next" -> "drm-tip" [label="rebuild" color=yellow]
+       "sound/for-linus" -> "drm-tip" [label="rebuild" color=yellow]
 
        # patch flow
        "intel-gfx" [label="intel-gfx mailing list"]
diff --git a/drm-intel.rst b/drm-intel.rst
index e9b4fe3e3214..bf9a8c314f85 100644
--- a/drm-intel.rst
+++ b/drm-intel.rst
@@ -136,7 +136,7 @@ flow of the commits to drm-upstream and Linus' tree.
 .. image:: drm-intel-flow.svg
 
 Legend: Green = Linus. Red = drm-upstream. Blue = drm-intel. Black = patches.
-Yellow = Additional trees from other subsystems.
+Yellow = Additional trees from/shared with other subsystems.
 
 Features
 --------
-- 
2.14.3



More information about the dim-tools mailing list