Skip to content

Commit e35b5a4

Browse files
rddunlapJonathan Corbet
authored andcommitted
Documentation: fixes to the maintainer-entry-profile template
Do some wordsmithing and copy editing on the maintainer-entry-profile profile (template, guide): - fix punctuation - fix some wording - use "-rc" consistently Signed-off-by: Randy Dunlap <[email protected]> Cc: Dan Williams <[email protected]> Cc: [email protected] Cc: Jonathan Corbet <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jonathan Corbet <[email protected]>
1 parent 9469b39 commit e35b5a4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/maintainer/maintainer-entry-profile.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The Maintainer Entry Profile supplements the top-level process documents
77
(submitting-patches, submitting drivers...) with
88
subsystem/device-driver-local customs as well as details about the patch
99
submission life-cycle. A contributor uses this document to level set
10-
their expectations and avoid common mistakes, maintainers may use these
10+
their expectations and avoid common mistakes; maintainers may use these
1111
profiles to look across subsystems for opportunities to converge on
1212
common practices.
1313

@@ -26,7 +26,7 @@ Example questions to consider:
2626
- Does the subsystem have a patchwork instance? Are patchwork state
2727
changes notified?
2828
- Any bots or CI infrastructure that watches the list, or automated
29-
testing feedback that the subsystem gates acceptance?
29+
testing feedback that the subsystem uses to gate acceptance?
3030
- Git branches that are pulled into -next?
3131
- What branch should contributors submit against?
3232
- Links to any other Maintainer Entry Profiles? For example a
@@ -54,8 +54,8 @@ One of the common misunderstandings of submitters is that patches can be
5454
sent at any time before the merge window closes and can still be
5555
considered for the next -rc1. The reality is that most patches need to
5656
be settled in soaking in linux-next in advance of the merge window
57-
opening. Clarify for the submitter the key dates (in terms rc release
58-
week) that patches might considered for merging and when patches need to
57+
opening. Clarify for the submitter the key dates (in terms of -rc release
58+
week) that patches might be considered for merging and when patches need to
5959
wait for the next -rc. At a minimum:
6060

6161
- Last -rc for new feature submissions:
@@ -70,8 +70,8 @@ wait for the next -rc. At a minimum:
7070
- Last -rc to merge features: Deadline for merge decisions
7171
Indicate to contributors the point at which an as yet un-applied patch
7272
set will need to wait for the NEXT+1 merge window. Of course there is no
73-
obligation to ever except any given patchset, but if the review has not
74-
concluded by this point the expectation the contributor should wait and
73+
obligation to ever accept any given patchset, but if the review has not
74+
concluded by this point the expectation is the contributor should wait and
7575
resubmit for the following merge window.
7676

7777
Optional:

0 commit comments

Comments
 (0)