[Intel-gfx] [maintainer-tools PATCH] dim.rst: Point to drm-intel.rst in case of conflict.

Rodrigo Vivi rodrigo.vivi at intel.com
Wed Mar 30 20:53:14 UTC 2016

When searching for how to solve my first commit here I didn't
noticed the right information was there already so I followed what
was stated here and started bothering maintainers! :)

Cc: Danie Vetter <daniel.vetter at ffwll.ch>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
 dim.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dim.rst b/dim.rst
index 4a011f4..bf4652a 100644
--- a/dim.rst
+++ b/dim.rst
@@ -395,11 +395,9 @@ rebasing) push out the new tree with::
     $ dim push-queued
-This will also rebuild a new drm-intel-nightly integration tree. If that fails,
-ask maintainers for help with resolving conflicts. One thing to note here is
-that the script syncs saved git rerere conflict resolutions around. One does the
-resolution, everyone has it. The drawback is, someone screws up the conflict
-resolution, everyone has it...
+This will also rebuild a new drm-intel-nightly integration tree. In case of
+conflict or for details of the patch flow and maintainer processes look at:
 Note that every two weeks Daniel cuts a new drm-intel-next by tagging what's in
 drm-intel-next-queued. To increase the chances that the tree isn't totally

More information about the Intel-gfx mailing list