On Wed, Jun 27, 2018 at 06:13:01PM +0300, Jani Nikula 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>
Acked-by: Rodrigo Vivi <rodrigo.v...@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. > + > + At most, minor comment and whitespace tweaks are acceptable. > + > On Confidence, Complexity, and Transparency > ------------------------------------------- > > -- > 2.11.0 > > _______________________________________________ > Intel-gfx mailing list > intel-...@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools