1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
#
# Copyright © 2014-2015 Intel Corporation
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
# Authors:
# Jani Nikula <jani.nikula@intel.com>
#
strict digraph "drm-intel" {
label="upstream, drm-core and drm-intel patch flow and process"
# upstream
mw1 [label="v4.X merge window" color=green]
rc1 [label="v4.X-rc1" color=green]
rcN [label="v4.X-rcN" color=green]
release [label="v4.X" color=green]
mw2 [label="v4.(X+1) merge window" color=green]
mw3 [label="v4.(X+2) merge window" color=green style=dashed]
mw1 -> rc1 [label="merge window close" color=green];
rc1 -> rcN -> rcN [label="release candidate cycles" color=green];
rcN -> release [label="release" color=green];
release -> mw2 [label="merge window open" color=green];
mw2 -> mw3 [label="another release cycle" color=green style=dashed];
# drm-core
"drm-next" [color=red]
"drm-fixes" [color=red]
"drm-next next" [color=red style=dashed]
"drm-fixes" -> rcN [label="fixes for current" color=red]
"drm-fixes" -> release [label="fixes for current" color=red]
"drm-next" -> mw2 [label="features for next" color=red]
"drm-next next" -> mw3 [color=red style=dashed]
# drm-intel
"drm-intel-fixes" [color=blue]
"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-intel-testing" [color=blue]
"drm-intel-internal" [color=blue]
"drm-intel-fixes" -> "drm-fixes" [label="weekly pulls\nrc1..release" color=blue]
"drm-intel-next" -> "drm-next next" [label="after ~rc5 of current" color=blue style=dashed]
"drm-intel-next" -> "drm-next" [label="up to ~rc5 of current" color=blue]
"drm-intel-next-fixes" -> "drm-next" [label="discretionary pulls\n~rc5..release" color=blue]
"drm-intel-next-queued" -> "drm-intel-next" [color=blue]
"drm-intel-next-queued" -> "drm-next" [label="special topic/* branches" color=blue]
"drm-tip" -> "drm-intel-testing" [label="snapshot for QA" color=blue]
# other trees in nightly
"sound/for-linus" [color=yellow style=dashed]
"sound/for-next" [color=yellow style=dashed]
# 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]
# 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"]
"internal" [label="internal mailing list"]
"fixes" -> "intel-gfx"
"feature patches" -> "intel-gfx"
"embargoed patches" -> "internal"
"drm-intel-internal" -> "feature patches" [label="feature release"]
"internal" -> "drm-intel-internal" [label="maintainers pick\nalways open"]
"intel-gfx" -> "drm-intel-next-queued" [label="committers/maintainers pick\nalways open"]
"drm-intel-next-queued" -> "drm-intel-fixes" [label="maintainers cherry-pick\nrc1..rcN of current" color=blue]
"drm-intel-next-queued" -> "drm-intel-next-fixes" [label="maintainers cherry-pick\n~rc5..release of current" color=blue]
}
|
