From: Jonathan Corbet <corbet@lwn.net>
To: Drew DeVault <sir@cmpwn.com>
Cc: linux-doc@vger.kernel.org
Subject: Re: [PATCH 3/4] Documentation/maintainer: rehome sign-off process
Date: Thu, 3 Sep 2020 09:50:05 -0600 [thread overview]
Message-ID: <20200903095005.7616a146@lwn.net> (raw)
In-Reply-To: <20200902155759.55895-4-sir@cmpwn.com>
On Wed, 2 Sep 2020 11:57:58 -0400
Drew DeVault <sir@cmpwn.com> wrote:
> The repeated sign-offs necessary when a subsystem maintainer modifies an
> incoming patch has been moved from submitting-patches.rst to
> Documentation/maintainer, since the affairs of a subsystem maintainer
> are not especially relevant to someone reading a guide for how to submit
> their first patch.
So this is generally what I wanted, but...
> Signed-off-by: Drew DeVault <sir@cmpwn.com>
> ---
> Documentation/maintainer/index.rst | 1 +
> .../maintainer/modifying-patches.rst | 50 +++++++++++++++++++
> Documentation/process/submitting-patches.rst | 46 -----------------
> 3 files changed, 51 insertions(+), 46 deletions(-)
> create mode 100644 Documentation/maintainer/modifying-patches.rst
>
> diff --git a/Documentation/maintainer/index.rst b/Documentation/maintainer/index.rst
> index d904e74e1159..f0a60435b124 100644
> --- a/Documentation/maintainer/index.rst
> +++ b/Documentation/maintainer/index.rst
> @@ -13,4 +13,5 @@ additions to this manual.
> rebasing-and-merging
> pull-requests
> maintainer-entry-profile
> + modifying-patches
>
> diff --git a/Documentation/maintainer/modifying-patches.rst b/Documentation/maintainer/modifying-patches.rst
> new file mode 100644
> index 000000000000..d7c3f557bf6e
> --- /dev/null
> +++ b/Documentation/maintainer/modifying-patches.rst
> @@ -0,0 +1,50 @@
> +.. _modifyingpatches:
> +
> +Modifying Patches
> +=================
> +
> +If you are a subsystem or branch maintainer, sometimes you need to slightly
> +modify patches you receive in order to merge them, because the code is not
> +exactly the same in your tree and the submitters'. If you stick strictly to
> +rule (c), you should ask the submitter to rediff, but this is a totally
"rule (c)" has not context here; readers won't know what is being talked
about. At a minimum, it should be "rule (c) of the developers certificate
of origin".
Also, "submitter's", might as well fix it while you're at it.
Thanks,
jon
next prev parent reply other threads:[~2020-09-03 15:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 15:57 [PATCH 0/4] Improvements to submitting-patches.rst Drew DeVault
2020-09-02 15:57 ` [PATCH 1/4] submitting-patches.rst: remove heading numbering Drew DeVault
2020-09-03 15:44 ` Jonathan Corbet
2020-09-03 15:48 ` Drew DeVault
2020-09-03 15:46 ` Jonathan Corbet
2020-09-02 15:57 ` [PATCH 2/4] Documentation/process: expand plain-text advice Drew DeVault
2020-09-02 16:06 ` Randy Dunlap
2020-09-02 16:20 ` Drew DeVault
2020-09-03 15:47 ` Jonathan Corbet
2020-09-02 15:57 ` [PATCH 3/4] Documentation/maintainer: rehome sign-off process Drew DeVault
2020-09-03 15:50 ` Jonathan Corbet [this message]
2020-09-02 15:57 ` [PATCH 4/4] submitting-patches.rst: presume git will be used Drew DeVault
2020-09-02 16:11 ` Randy Dunlap
2020-09-02 16:11 ` Drew DeVault
2020-09-03 15:57 ` Jonathan Corbet
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=20200903095005.7616a146@lwn.net \
--to=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=sir@cmpwn.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).