Skip to content
Snippets Groups Projects
Commit 5b007312 authored by Sean Paul's avatar Sean Paul :speech_balloon: Committed by Simona Vetter
Browse files

docs: drm-misc: Remove misc-next merges during merge window/rc1


In the merge timeline, remove the misc-next ~> drm-next merges while
the merge window is active, and during rc1. Pulls should only be requested
between rc2 and rc5.

Signed-off-by: Sean Paul's avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fb7d7d67
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,7 @@
wave: '=..0.=.......0.',
data: ['drm features for release + 1',
'drm features for release + 2'],
node: '...g.stuvw"..h.' }
node: '...g...uvw"..h.' }
],
{ name: 'drm-misc-fixes',
......@@ -45,7 +45,7 @@
wave: '=........=.....',
data: ['drm-misc features for release + 2',
'drm-misc features for release + 3'],
node: '....rxyz;:.....' },
node: '......yz;:.....' },
],
edge: [
......@@ -58,7 +58,7 @@
/* misc-next-fixes to -next */
'o~>g', 'q~>p',
/* misc-next to -next */
'r~>s', 'x~>t', 'y~>u', 'z~>v', ';~>w', ':~>"'
'y~>u', 'z~>v', ';~>w', ':~>"'
],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment