diff --git a/drm-intel-flow.dot b/drm-intel-flow.dot index 1be86164f5e05fd9a4d4551a1dfa9397215bf804..d894bc4c3bf3a91f17f120ee6b4f1fce6a8edc21 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,19 @@ strict digraph "drm-intel" { "sound/for-linus" [color=yellow style=dashed] "sound/for-next" [color=yellow style=dashed] - # nightly rebuild + # drm-tip + "drm-tip" [color=yellow] + + # Intel contributions "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] + + # external contributions + "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 e9b4fe3e32149dee4ba205dc4b368bb6006145ea..bf9a8c314f85c7ac783d434944085d78d9fdd3be 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 --------