diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2018-06-27 18:09:53 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-07-05 16:49:55 +0300 |
| commit | 387496d5554abd62e6b85faba94b56f1fe27ff08 (patch) | |
| tree | 66b10fb18fb1317f954075854ee11305869f64e5 | |
| parent | 11286421fcc936e7574065122eda59765bcc953d (diff) | |
doc: clarify what type of changes are acceptable at commit time
As a rule of thumb, don't change patches while committing.
v2: Added note about conflicts (Daniel)
Cc: Imre Deak <imre.deak@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
| -rw-r--r-- | drm-intel.rst | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drm-intel.rst b/drm-intel.rst index 79cae96f40a8..eb06655d2308 100644 --- a/drm-intel.rst +++ b/drm-intel.rst @@ -196,6 +196,16 @@ An inexhaustive list of details to check: coordinate with maintainers to avoid unnecessary pain with conflicts. Usually some explicit merges are needed to avoid git getting lost. +* As a general rule, do not modify the patches while applying, apart from the + commit message. If the patch conflicts, or needs to be changed due to review, + have the author rebase, update and resend. Any change at this stage is a + potential issue bypassing CI. + + At most, minor comment and whitespace tweaks are acceptable. + +* Please notify maintainers (IRC is fine) of new merge conflicts during drm-tip + rebuild, so that they can do backmerges as needed. + On Confidence, Complexity, and Transparency ------------------------------------------- |