On Wed, 27 Jun 2018, Daniel Vetter <dan...@ffwll.ch> wrote: > On Wed, Jun 27, 2018 at 5:13 PM, Jani Nikula <jani.nik...@intel.com> wrote: >> As a rule of thumb, don't change patches while committing. >> >> Cc: Imre Deak <imre.d...@intel.com> >> Signed-off-by: Jani Nikula <jani.nik...@intel.com> >> --- >> drm-intel.rst | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/drm-intel.rst b/drm-intel.rst >> index baf48f459dd9..ad8ff9739336 100644 >> --- a/drm-intel.rst >> +++ b/drm-intel.rst >> @@ -196,6 +196,13 @@ 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. >> > Should we also mention that merge conflicts need to be told to > maintainers, so that they can do a backmerge? Just because this blew > up recently for drm-misc ...
Added bullet * Please notify maintainers (IRC is fine) of new merge conflicts during drm-tip rebuild, so that they can do backmerges as needed. and pushed to get this done. Please amend if that's not what you wanted. Thanks, Jani. > -Daniel > >> + At most, minor comment and whitespace tweaks are acceptable. >> + >> On Confidence, Complexity, and Transparency >> ------------------------------------------- >> >> -- >> 2.11.0 >> >> _______________________________________________ >> dim-tools mailing list >> dim-tools@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools
