Skip to content

Commit 8449e5c

Browse files
trinixypron
authored andcommitted
doc: develop: process: Move Custodians section
Move the "Custodians" section to be after the "Review Process, Git Tags" section, in preparation for more re-organization. Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
1 parent 7db3367 commit 8449e5c

1 file changed

Lines changed: 41 additions & 41 deletions

File tree

doc/develop/process.rst

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -120,47 +120,6 @@ these can be "cherry-picked" and are subject to the normal merge rules. For
120120
example, a bug fix can come in later in the window but a full re-sync only
121121
happens within the merge window itself.
122122

123-
.. _custodians:
124-
125-
Custodians
126-
----------
127-
128-
The Custodians take responsibility for some area of the U-Boot code. The
129-
in-tree ``MAINTAINERS`` files list who is responsible for which areas.
130-
131-
It is their responsibility to pick up patches from the mailing list
132-
that fall into their responsibility, and to process these.
133-
134-
A very important responsibility of each custodian is to provide
135-
feedback to the submitter of a patch about what is going on:
136-
137-
* If the patch was accepted, or if it was rejected (with exact list
138-
of reasons), if it needs to be reworked (with respective review
139-
comments). Even a "I have no time now, will look into it later"
140-
message is better than nothing. Also, if there are remarks to a
141-
patch, these should leave no doubt if they were just comments and
142-
the patch will be accepted anyway, or if the patch should be
143-
reworked/resubmitted, or if it was rejected. However, if a submitter
144-
feels it has been too long since posting their patch and not
145-
received any feedback, it is OK to follow-up and ask.
146-
147-
* A custodian may make changes suggested by :doc:`checkpatch.pl
148-
<checkpatch>`. They must also in turn amend the commit message noting
149-
their change, for example ``[trini: Fix typos]``, and add their own
150-
:ref:`Signed-off-by <dco>` tag. All other changes must be handled by
151-
another iteration of the patch, or follow-up patch.
152-
153-
* If the patch itself can still be applied to the tree. The custodian
154-
is expected to put in a "best effort" if a patch does not apply
155-
cleanly, but can be made to apply still. It is up to the custodian
156-
to decide how recent of a commit the patch must be against. It is
157-
acceptable to request patches against the last officially released
158-
version of U-Boot or newer. Of course a custodian can also accept
159-
patches against older code. It can be difficult to find the correct
160-
balance between putting too much work on the custodian or too much
161-
work on an individual submitting a patch when something does not
162-
apply cleanly.
163-
164123
Review Process, Git Tags
165124
------------------------
166125

@@ -232,6 +191,47 @@ document.
232191
For example, when your change affects a specific board or driver, then makes
233192
a lot of sense to put the respective maintainer of this code on Cc:
234193

194+
.. _custodians:
195+
196+
Custodians
197+
----------
198+
199+
The Custodians take responsibility for some area of the U-Boot code. The
200+
in-tree ``MAINTAINERS`` files list who is responsible for which areas.
201+
202+
It is their responsibility to pick up patches from the mailing list
203+
that fall into their responsibility, and to process these.
204+
205+
A very important responsibility of each custodian is to provide
206+
feedback to the submitter of a patch about what is going on:
207+
208+
* If the patch was accepted, or if it was rejected (with exact list
209+
of reasons), if it needs to be reworked (with respective review
210+
comments). Even a "I have no time now, will look into it later"
211+
message is better than nothing. Also, if there are remarks to a
212+
patch, these should leave no doubt if they were just comments and
213+
the patch will be accepted anyway, or if the patch should be
214+
reworked/resubmitted, or if it was rejected. However, if a submitter
215+
feels it has been too long since posting their patch and not
216+
received any feedback, it is OK to follow-up and ask.
217+
218+
* A custodian may make changes suggested by :doc:`checkpatch.pl
219+
<checkpatch>`. They must also in turn amend the commit message noting
220+
their change, for example ``[trini: Fix typos]``, and add their own
221+
:ref:`Signed-off-by <dco>` tag. All other changes must be handled by
222+
another iteration of the patch, or follow-up patch.
223+
224+
* If the patch itself can still be applied to the tree. The custodian
225+
is expected to put in a "best effort" if a patch does not apply
226+
cleanly, but can be made to apply still. It is up to the custodian
227+
to decide how recent of a commit the patch must be against. It is
228+
acceptable to request patches against the last officially released
229+
version of U-Boot or newer. Of course a custodian can also accept
230+
patches against older code. It can be difficult to find the correct
231+
balance between putting too much work on the custodian or too much
232+
work on an individual submitting a patch when something does not
233+
apply cleanly.
234+
235235
Work flow of a Custodian
236236
------------------------
237237

0 commit comments

Comments
 (0)