[maintainer-tools PATCH] docs: drm-misc: Remove misc-next merges during merge window/rc1

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 <seanpaul@xxxxxxxxxxxx>
---

While the early PR no-no is fresh in my mind, I'll update the merge timeline
to avoid making the same mistake again.

Sean



 drm-misc-timeline.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drm-misc-timeline.json b/drm-misc-timeline.json
index 7b039ce..30f4043 100644
--- a/drm-misc-timeline.json
+++ b/drm-misc-timeline.json
@@ -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', ':~>"'
 
 	],
 
-- 
2.13.0.rc1.294.g07d810a77f-goog

_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux