From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, dim-tools@lists.freedesktop.org
Subject: Re: [DIM DOCS PATCH 2/2] doc: clarify what type of changes are acceptable at commit time
Date: Wed, 27 Jun 2018 22:00:07 -0700 [thread overview]
Message-ID: <20180628050007.GJ9765@intel.com> (raw)
In-Reply-To: <20180627151301.9674-2-jani.nikula@intel.com>
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.deak@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@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-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-06-28 5:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-27 15:13 [DIM DOCS PATCH 1/2] doc: update CI and pre-merge details in committer guidelines Jani Nikula
2018-06-27 15:13 ` [DIM DOCS PATCH 2/2] doc: clarify what type of changes are acceptable at commit time Jani Nikula
2018-06-27 17:10 ` Daniel Vetter
2018-07-05 13:53 ` Jani Nikula
2018-07-05 15:45 ` Daniel Vetter
2018-07-06 7:02 ` Jani Nikula
2018-06-28 5:00 ` Rodrigo Vivi [this message]
2018-06-27 17:09 ` [DIM DOCS PATCH 1/2] doc: update CI and pre-merge details in committer guidelines Daniel Vetter
2018-07-05 13:51 ` Jani Nikula
2018-06-28 4:59 ` Rodrigo Vivi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180628050007.GJ9765@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=dim-tools@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).