[Intel-gfx] [maintainer-tools PATCH] drm-intel: Add note about patches that move code between files

Ander Conselvan de Oliveira ander.conselvan.de.oliveira at intel.com
Wed Mar 9 11:46:25 UTC 2016

Patches that move big chunks of code between files can cause some
complicated conflicts. Add a note to coordinate with maintainers before
merging such patches.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
 drm-intel.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drm-intel.rst b/drm-intel.rst
index c0c2f20..89df24b 100644
--- a/drm-intel.rst
+++ b/drm-intel.rst
@@ -350,6 +350,10 @@ An inexhaustive list of details to check:
   http://developercertificate.org/. dim apply-branch should do this
   automatically for you.
+* For patches that move around lots of code (file rename or extraction) please
+  coordinate with maintainers to avoid unnecessary pain with conflicts. Usually
+  some explicit merges are needed to avoid git getting lost.
 On Confidence, Complexity, and Transparency

More information about the Intel-gfx mailing list