On Wed, 2 Sep 2020 11:57:58 -0400 Drew DeVault <sir@xxxxxxxxx> 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@xxxxxxxxx> > --- > 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
