[i-g-t,RFC] CONTRIBUTING: commit rights docs

Commit Message

Daniel Vetter April 13, 2018, 10 a.m. UTC

This tries to align with the X.org communities's long-standing
tradition of trying to be an inclusive community and handing out
commit rights fairly freely.

We also tend to not revoke commit rights for people no longer
regularly active in a given project, as long as they're still part of
the larger community.

Finally make sure that commit rights, like anything happening on fd.o
infrastructre, is subject to the fd.o's Code of Conduct.

v2: Point at MAINTAINERS for contact info (Daniel S.)

v3:
- Make it clear that commit rights are voluntary and that committers
  need to acknowledge positively when they're nominated by someone
  else (Keith).
- Encourage committers to drop their commit rights when they're no
  longer active, and make it clear they'll get readded (Keith).
- Add a line that maintainers and committers should actively nominate
  new committers (me).

v4: Typo (Petri).

v5: Typo (Sean).

v6: Wording clarifications and spelling (Jani).

v7: Require an explicit commitment to the documented merge criteria
and rules, instead of just the implied one through the Code of Conduct
threat (Jani).

Acked-by: Alex Deucher <[e-mail]>
Acked-by: Arkadiusz Hiler <[e-mail]>
Acked-by: Daniel Stone <[e-mail]>
Acked-by: Eric Anholt <[e-mail]>
Acked-by: Gustavo Padovan <[e-mail]>
Acked-by: Petri Latvala <[e-mail]>
Cc: Alex Deucher <[e-mail]>
Cc: Arkadiusz Hiler <[e-mail]>
Cc: Ben Widawsky <[e-mail]>
Cc: Daniel Stone <[e-mail]>
Cc: Dave Airlie <[e-mail]>
Cc: Eric Anholt <[e-mail]>
Cc: Gustavo Padovan <[e-mail]>
Cc: Jani Nikula <[e-mail]>
Cc: Joonas Lahtinen <[e-mail]>
Cc: Keith Packard <[e-mail]>
Cc: Kenneth Graunke <[e-mail]>
Cc: Kristian H. Kristensen <[e-mail]>
Cc: Maarten Lankhorst <[e-mail]>
Cc: Petri Latvala <[e-mail]>
Cc: Rodrigo Vivi <[e-mail]>
Cc: Sean Paul <[e-mail]>
Reviewed-by: Keith Packard <[e-mail]>
Signed-off-by: Daniel Vetter <[e-mail]>
---
If you wonder about the wide distribution list for an igt patch: I'd
like to start a discussions about x.org community norms around commit
rights at large, at least for all the shared repos. I plan to propose
the same text for drm-misc and libdrm too, and hopefully others like
mesa/xserver/wayland would follow.

fd.o admins also plan to discuss this (and a pile of other topics and
hosting and code of conduct) with all projects, ideally this here
would end up as the starting point for establishing some community
norms.
-Daniel
---
 CONTRIBUTING | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

Comments

Harry Wentland April 13, 2018, 7:48 p.m. UTC | #1

On 2018-04-13 06:00 AM, Daniel Vetter wrote:
> This tries to align with the X.org communities's long-standing
> tradition of trying to be an inclusive community and handing out
> commit rights fairly freely.
> 
> We also tend to not revoke commit rights for people no longer
> regularly active in a given project, as long as they're still part of
> the larger community.
> 
> Finally make sure that commit rights, like anything happening on fd.o
> infrastructre, is subject to the fd.o's Code of Conduct.
> 
> v2: Point at MAINTAINERS for contact info (Daniel S.)
> 
> v3:
> - Make it clear that commit rights are voluntary and that committers
>   need to acknowledge positively when they're nominated by someone
>   else (Keith).
> - Encourage committers to drop their commit rights when they're no
>   longer active, and make it clear they'll get readded (Keith).
> - Add a line that maintainers and committers should actively nominate
>   new committers (me).
> 
> v4: Typo (Petri).
> 
> v5: Typo (Sean).
> 
> v6: Wording clarifications and spelling (Jani).
> 
> v7: Require an explicit commitment to the documented merge criteria
> and rules, instead of just the implied one through the Code of Conduct
> threat (Jani).
> 
> Acked-by: Alex Deucher <[e-mail]>
> Acked-by: Arkadiusz Hiler <[e-mail]>
> Acked-by: Daniel Stone <[e-mail]>
> Acked-by: Eric Anholt <[e-mail]>
> Acked-by: Gustavo Padovan <[e-mail]>
> Acked-by: Petri Latvala <[e-mail]>

Acked-by: Harry Wentland <[e-mail]>

Harry

> Cc: Alex Deucher <[e-mail]>
> Cc: Arkadiusz Hiler <[e-mail]>
> Cc: Ben Widawsky <[e-mail]>
> Cc: Daniel Stone <[e-mail]>
> Cc: Dave Airlie <[e-mail]>
> Cc: Eric Anholt <[e-mail]>
> Cc: Gustavo Padovan <[e-mail]>
> Cc: Jani Nikula <[e-mail]>
> Cc: Joonas Lahtinen <[e-mail]>
> Cc: Keith Packard <[e-mail]>
> Cc: Kenneth Graunke <[e-mail]>
> Cc: Kristian H. Kristensen <[e-mail]>
> Cc: Maarten Lankhorst <[e-mail]>
> Cc: Petri Latvala <[e-mail]>
> Cc: Rodrigo Vivi <[e-mail]>
> Cc: Sean Paul <[e-mail]>
> Reviewed-by: Keith Packard <[e-mail]>
> Signed-off-by: Daniel Vetter <[e-mail]>
> ---
> If you wonder about the wide distribution list for an igt patch: I'd
> like to start a discussions about x.org community norms around commit
> rights at large, at least for all the shared repos. I plan to propose
> the same text for drm-misc and libdrm too, and hopefully others like
> mesa/xserver/wayland would follow.
> 
> fd.o admins also plan to discuss this (and a pile of other topics and
> hosting and code of conduct) with all projects, ideally this here
> would end up as the starting point for establishing some community
> norms.
> -Daniel
> ---
>  CONTRIBUTING | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 48 insertions(+)
> 
> diff --git a/CONTRIBUTING b/CONTRIBUTING
> index 0180641be3aa..8a118134275c 100644
> --- a/CONTRIBUTING
> +++ b/CONTRIBUTING
> @@ -51,4 +51,52 @@ A short list of contribution guidelines:
>  - Changes to the testcases are automatically tested. Take the results into
>    account before merging.
>  
> +Commit rights
> +-------------
> +
> +Commit rights will be granted to anyone who requests them and fulfills the
> +below criteria:
> +
> +- Submitted a few (5-10 as a rule of thumb) non-trivial (not just simple
> +  spelling fixes and whitespace adjustment) patches that have been merged
> +  already.
> +
> +- Are actively participating on discussions about their work (on the mailing
> +  list or IRC). This should not be interpreted as a requirement to review other
> +  peoples patches but just make sure that patch submission isn't one-way
> +  communication. Cross-review is still highly encouraged.
> +
> +- Will be regularly contributing further patches. This includes regular
> +  contributors to other parts of the open source graphics stack who only
> +  do the oddball rare patch within igt itself.
> +
> +- Agrees to use their commit rights in accordance with the documented merge
> +  criteria, tools, and processes.
> +
> +Apply for an account (and any other account change requests) through
> +
> +https://www.freedesktop.org/wiki/AccountRequests/
> +
> +and please ping the maintainers if your request is stuck.
> +
> +Committers are encouraged to request their commit rights get removed when they
> +no longer contribute to the project. Commit rights will be reinstated when they
> +come back to the project.
> +
> +Maintainers and committers should encourage contributors to request commit
> +rights, especially junior contributors tend to underestimate their skills.
> +
> +Code of Conduct
> +---------------
> +
> +Please be aware the fd.o Code of Conduct also applies to igt:
> +
> +https://www.freedesktop.org/wiki/CodeOfConduct/
> +
> +See the MAINTAINERS file for contact details of the igt maintainers.
> +
> +Abuse of commit rights, like engaging in commit fights or willfully pushing
> +patches that violate the documented merge criteria, will also be handled through
> +the Code of Conduct enforcement process.
> +
>  Happy hacking!
>

Emil Velikov April 24, 2018, 5:30 p.m. UTC | #2

On 13 April 2018 at 11:00, Daniel Vetter <[e-mail]> wrote:
> This tries to align with the X.org communities's long-standing
> tradition of trying to be an inclusive community and handing out
> commit rights fairly freely.
>
> We also tend to not revoke commit rights for people no longer
> regularly active in a given project, as long as they're still part of
> the larger community.
>
> Finally make sure that commit rights, like anything happening on fd.o
> infrastructre, is subject to the fd.o's Code of Conduct.
>
> v2: Point at MAINTAINERS for contact info (Daniel S.)
>
> v3:
> - Make it clear that commit rights are voluntary and that committers
>   need to acknowledge positively when they're nominated by someone
>   else (Keith).
> - Encourage committers to drop their commit rights when they're no
>   longer active, and make it clear they'll get readded (Keith).
> - Add a line that maintainers and committers should actively nominate
>   new committers (me).
>
> v4: Typo (Petri).
>
> v5: Typo (Sean).
>
> v6: Wording clarifications and spelling (Jani).
>
> v7: Require an explicit commitment to the documented merge criteria
> and rules, instead of just the implied one through the Code of Conduct
> threat (Jani).
>
> Acked-by: Alex Deucher <[e-mail]>
> Acked-by: Arkadiusz Hiler <[e-mail]>
> Acked-by: Daniel Stone <[e-mail]>
> Acked-by: Eric Anholt <[e-mail]>
> Acked-by: Gustavo Padovan <[e-mail]>
> Acked-by: Petri Latvala <[e-mail]>
> Cc: Alex Deucher <[e-mail]>
> Cc: Arkadiusz Hiler <[e-mail]>
> Cc: Ben Widawsky <[e-mail]>
> Cc: Daniel Stone <[e-mail]>
> Cc: Dave Airlie <[e-mail]>
> Cc: Eric Anholt <[e-mail]>
> Cc: Gustavo Padovan <[e-mail]>
> Cc: Jani Nikula <[e-mail]>
> Cc: Joonas Lahtinen <[e-mail]>
> Cc: Keith Packard <[e-mail]>
> Cc: Kenneth Graunke <[e-mail]>
> Cc: Kristian H. Kristensen <[e-mail]>
> Cc: Maarten Lankhorst <[e-mail]>
> Cc: Petri Latvala <[e-mail]>
> Cc: Rodrigo Vivi <[e-mail]>
> Cc: Sean Paul <[e-mail]>
> Reviewed-by: Keith Packard <[e-mail]>
> Signed-off-by: Daniel Vetter <[e-mail]>
> ---
> If you wonder about the wide distribution list for an igt patch: I'd
> like to start a discussions about x.org community norms around commit
> rights at large, at least for all the shared repos. I plan to propose
> the same text for drm-misc and libdrm too, and hopefully others like
> mesa/xserver/wayland would follow.
>
I think the idea is pretty good, simply highlighting some bits.

What you've outlined in this patch has been in practise for many years:
 a) undocumented, applicable to most xorg projects [1]
 b) documented, mesa

IMHO having this explicitly documented and others
(wayland/weston/wayland-protocols and xserver repos) following suite
is a big plus.

HTH
Emil

[1] As in all of https://cgit.freedesktop.org/xorg but xserver

Daniel Vetter April 24, 2018, 7:14 p.m. UTC | #3

On Tue, Apr 24, 2018 at 7:30 PM, Emil Velikov <[e-mail]> wrote:
> On 13 April 2018 at 11:00, Daniel Vetter <[e-mail]> wrote:
>> This tries to align with the X.org communities's long-standing
>> tradition of trying to be an inclusive community and handing out
>> commit rights fairly freely.
>>
>> We also tend to not revoke commit rights for people no longer
>> regularly active in a given project, as long as they're still part of
>> the larger community.
>>
>> Finally make sure that commit rights, like anything happening on fd.o
>> infrastructre, is subject to the fd.o's Code of Conduct.
>>
>> v2: Point at MAINTAINERS for contact info (Daniel S.)
>>
>> v3:
>> - Make it clear that commit rights are voluntary and that committers
>>   need to acknowledge positively when they're nominated by someone
>>   else (Keith).
>> - Encourage committers to drop their commit rights when they're no
>>   longer active, and make it clear they'll get readded (Keith).
>> - Add a line that maintainers and committers should actively nominate
>>   new committers (me).
>>
>> v4: Typo (Petri).
>>
>> v5: Typo (Sean).
>>
>> v6: Wording clarifications and spelling (Jani).
>>
>> v7: Require an explicit commitment to the documented merge criteria
>> and rules, instead of just the implied one through the Code of Conduct
>> threat (Jani).
>>
>> Acked-by: Alex Deucher <[e-mail]>
>> Acked-by: Arkadiusz Hiler <[e-mail]>
>> Acked-by: Daniel Stone <[e-mail]>
>> Acked-by: Eric Anholt <[e-mail]>
>> Acked-by: Gustavo Padovan <[e-mail]>
>> Acked-by: Petri Latvala <[e-mail]>
>> Cc: Alex Deucher <[e-mail]>
>> Cc: Arkadiusz Hiler <[e-mail]>
>> Cc: Ben Widawsky <[e-mail]>
>> Cc: Daniel Stone <[e-mail]>
>> Cc: Dave Airlie <[e-mail]>
>> Cc: Eric Anholt <[e-mail]>
>> Cc: Gustavo Padovan <[e-mail]>
>> Cc: Jani Nikula <[e-mail]>
>> Cc: Joonas Lahtinen <[e-mail]>
>> Cc: Keith Packard <[e-mail]>
>> Cc: Kenneth Graunke <[e-mail]>
>> Cc: Kristian H. Kristensen <[e-mail]>
>> Cc: Maarten Lankhorst <[e-mail]>
>> Cc: Petri Latvala <[e-mail]>
>> Cc: Rodrigo Vivi <[e-mail]>
>> Cc: Sean Paul <[e-mail]>
>> Reviewed-by: Keith Packard <[e-mail]>
>> Signed-off-by: Daniel Vetter <[e-mail]>
>> ---
>> If you wonder about the wide distribution list for an igt patch: I'd
>> like to start a discussions about x.org community norms around commit
>> rights at large, at least for all the shared repos. I plan to propose
>> the same text for drm-misc and libdrm too, and hopefully others like
>> mesa/xserver/wayland would follow.
>>
> I think the idea is pretty good, simply highlighting some bits.
>
> What you've outlined in this patch has been in practise for many years:
>  a) undocumented, applicable to most xorg projects [1]
>  b) documented, mesa

Hm, I chatted with a few mesa devs about this, and I wasn't aware
there's explicit documentation for mesa. Where is it? I'd very much
want to align as much as we can.

> IMHO having this explicitly documented and others
> (wayland/weston/wayland-protocols and xserver repos) following suite
> is a big plus.

Yeah, that's the idea. Hence plenty of Cc: for this igt patch.
-Daniel

>
> HTH
> Emil
>
> [1] As in all of https://cgit.freedesktop.org/xorg but xserver

Sean Paul April 24, 2018, 9:05 p.m. UTC | #4

On Fri, Apr 13, 2018 at 6:01 AM Daniel Vetter <[e-mail]>
wrote:

> This tries to align with the X.org communities's long-standing
> tradition of trying to be an inclusive community and handing out
> commit rights fairly freely.

> We also tend to not revoke commit rights for people no longer
> regularly active in a given project, as long as they're still part of
> the larger community.

> Finally make sure that commit rights, like anything happening on fd.o
> infrastructre, is subject to the fd.o's Code of Conduct.

> v2: Point at MAINTAINERS for contact info (Daniel S.)

> v3:
> - Make it clear that commit rights are voluntary and that committers
>    need to acknowledge positively when they're nominated by someone
>    else (Keith).
> - Encourage committers to drop their commit rights when they're no
>    longer active, and make it clear they'll get readded (Keith).
> - Add a line that maintainers and committers should actively nominate
>    new committers (me).

> v4: Typo (Petri).

> v5: Typo (Sean).

I don't remember this, but good for me!

Current revision looks good, and I am supportive of applying it to drm-misc.

Acked-by: Sean Paul <[e-mail]>


> v6: Wording clarifications and spelling (Jani).

> v7: Require an explicit commitment to the documented merge criteria
> and rules, instead of just the implied one through the Code of Conduct
> threat (Jani).

> Acked-by: Alex Deucher <[e-mail]>
> Acked-by: Arkadiusz Hiler <[e-mail]>
> Acked-by: Daniel Stone <[e-mail]>
> Acked-by: Eric Anholt <[e-mail]>
> Acked-by: Gustavo Padovan <[e-mail]>
> Acked-by: Petri Latvala <[e-mail]>
> Cc: Alex Deucher <[e-mail]>
> Cc: Arkadiusz Hiler <[e-mail]>
> Cc: Ben Widawsky <[e-mail]>
> Cc: Daniel Stone <[e-mail]>
> Cc: Dave Airlie <[e-mail]>
> Cc: Eric Anholt <[e-mail]>
> Cc: Gustavo Padovan <[e-mail]>
> Cc: Jani Nikula <[e-mail]>
> Cc: Joonas Lahtinen <[e-mail]>
> Cc: Keith Packard <[e-mail]>
> Cc: Kenneth Graunke <[e-mail]>
> Cc: Kristian H. Kristensen <[e-mail]>
> Cc: Maarten Lankhorst <[e-mail]>
> Cc: Petri Latvala <[e-mail]>
> Cc: Rodrigo Vivi <[e-mail]>
> Cc: Sean Paul <[e-mail]>
> Reviewed-by: Keith Packard <[e-mail]>
> Signed-off-by: Daniel Vetter <[e-mail]>
> ---
> If you wonder about the wide distribution list for an igt patch: I'd
> like to start a discussions about x.org community norms around commit
> rights at large, at least for all the shared repos. I plan to propose
> the same text for drm-misc and libdrm too, and hopefully others like
> mesa/xserver/wayland would follow.

> fd.o admins also plan to discuss this (and a pile of other topics and
> hosting and code of conduct) with all projects, ideally this here
> would end up as the starting point for establishing some community
> norms.
> -Daniel
> ---
>   CONTRIBUTING | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 48 insertions(+)

> diff --git a/CONTRIBUTING b/CONTRIBUTING
> index 0180641be3aa..8a118134275c 100644
> --- a/CONTRIBUTING
> +++ b/CONTRIBUTING
> @@ -51,4 +51,52 @@ A short list of contribution guidelines:
>   - Changes to the testcases are automatically tested. Take the results
into
>     account before merging.

> +Commit rights
> +-------------
> +
> +Commit rights will be granted to anyone who requests them and fulfills
the
> +below criteria:
> +
> +- Submitted a few (5-10 as a rule of thumb) non-trivial (not just simple
> +  spelling fixes and whitespace adjustment) patches that have been merged
> +  already.
> +
> +- Are actively participating on discussions about their work (on the
mailing
> +  list or IRC). This should not be interpreted as a requirement to
review other
> +  peoples patches but just make sure that patch submission isn't one-way
> +  communication. Cross-review is still highly encouraged.
> +
> +- Will be regularly contributing further patches. This includes regular
> +  contributors to other parts of the open source graphics stack who only
> +  do the oddball rare patch within igt itself.
> +
> +- Agrees to use their commit rights in accordance with the documented
merge
> +  criteria, tools, and processes.
> +
> +Apply for an account (and any other account change requests) through
> +
> +https://www.freedesktop.org/wiki/AccountRequests/
> +
> +and please ping the maintainers if your request is stuck.
> +
> +Committers are encouraged to request their commit rights get removed
when they
> +no longer contribute to the project. Commit rights will be reinstated
when they
> +come back to the project.
> +
> +Maintainers and committers should encourage contributors to request
commit
> +rights, especially junior contributors tend to underestimate their
skills.
> +
> +Code of Conduct
> +---------------
> +
> +Please be aware the fd.o Code of Conduct also applies to igt:
> +
> +https://www.freedesktop.org/wiki/CodeOfConduct/
> +
> +See the MAINTAINERS file for contact details of the igt maintainers.
> +
> +Abuse of commit rights, like engaging in commit fights or willfully
pushing
> +patches that violate the documented merge criteria, will also be handled
through
> +the Code of Conduct enforcement process.
> +
>   Happy hacking!
> --
> 2.16.2

Emil Velikov April 25, 2018, 12:27 p.m. UTC | #5

On 24 April 2018 at 20:14, Daniel Vetter <[e-mail]> wrote:
> On Tue, Apr 24, 2018 at 7:30 PM, Emil Velikov <[e-mail]> wrote:
>> On 13 April 2018 at 11:00, Daniel Vetter <[e-mail]> wrote:
>>> This tries to align with the X.org communities's long-standing
>>> tradition of trying to be an inclusive community and handing out
>>> commit rights fairly freely.
>>>
>>> We also tend to not revoke commit rights for people no longer
>>> regularly active in a given project, as long as they're still part of
>>> the larger community.
>>>
>>> Finally make sure that commit rights, like anything happening on fd.o
>>> infrastructre, is subject to the fd.o's Code of Conduct.
>>>
>>> v2: Point at MAINTAINERS for contact info (Daniel S.)
>>>
>>> v3:
>>> - Make it clear that commit rights are voluntary and that committers
>>>   need to acknowledge positively when they're nominated by someone
>>>   else (Keith).
>>> - Encourage committers to drop their commit rights when they're no
>>>   longer active, and make it clear they'll get readded (Keith).
>>> - Add a line that maintainers and committers should actively nominate
>>>   new committers (me).
>>>
>>> v4: Typo (Petri).
>>>
>>> v5: Typo (Sean).
>>>
>>> v6: Wording clarifications and spelling (Jani).
>>>
>>> v7: Require an explicit commitment to the documented merge criteria
>>> and rules, instead of just the implied one through the Code of Conduct
>>> threat (Jani).
>>>
>>> Acked-by: Alex Deucher <[e-mail]>
>>> Acked-by: Arkadiusz Hiler <[e-mail]>
>>> Acked-by: Daniel Stone <[e-mail]>
>>> Acked-by: Eric Anholt <[e-mail]>
>>> Acked-by: Gustavo Padovan <[e-mail]>
>>> Acked-by: Petri Latvala <[e-mail]>
>>> Cc: Alex Deucher <[e-mail]>
>>> Cc: Arkadiusz Hiler <[e-mail]>
>>> Cc: Ben Widawsky <[e-mail]>
>>> Cc: Daniel Stone <[e-mail]>
>>> Cc: Dave Airlie <[e-mail]>
>>> Cc: Eric Anholt <[e-mail]>
>>> Cc: Gustavo Padovan <[e-mail]>
>>> Cc: Jani Nikula <[e-mail]>
>>> Cc: Joonas Lahtinen <[e-mail]>
>>> Cc: Keith Packard <[e-mail]>
>>> Cc: Kenneth Graunke <[e-mail]>
>>> Cc: Kristian H. Kristensen <[e-mail]>
>>> Cc: Maarten Lankhorst <[e-mail]>
>>> Cc: Petri Latvala <[e-mail]>
>>> Cc: Rodrigo Vivi <[e-mail]>
>>> Cc: Sean Paul <[e-mail]>
>>> Reviewed-by: Keith Packard <[e-mail]>
>>> Signed-off-by: Daniel Vetter <[e-mail]>
>>> ---
>>> If you wonder about the wide distribution list for an igt patch: I'd
>>> like to start a discussions about x.org community norms around commit
>>> rights at large, at least for all the shared repos. I plan to propose
>>> the same text for drm-misc and libdrm too, and hopefully others like
>>> mesa/xserver/wayland would follow.
>>>
>> I think the idea is pretty good, simply highlighting some bits.
>>
>> What you've outlined in this patch has been in practise for many years:
>>  a) undocumented, applicable to most xorg projects [1]
>>  b) documented, mesa
>
> Hm, I chatted with a few mesa devs about this, and I wasn't aware
> there's explicit documentation for mesa. Where is it? I'd very much
> want to align as much as we can.
>
See the "Developer git Access" section in [1]. FWIW I prefer the
wording used in this patch and the CoC reference is a big plus.

HTH
Emil

[1] https://www.mesa3d.org/repository.html

Daniel Vetter April 25, 2018, 1:42 p.m. UTC | #6

On Wed, Apr 25, 2018 at 01:27:20PM +0100, Emil Velikov wrote:
> On 24 April 2018 at 20:14, Daniel Vetter <[e-mail]> wrote:
> > On Tue, Apr 24, 2018 at 7:30 PM, Emil Velikov <[e-mail]> wrote:
> >> On 13 April 2018 at 11:00, Daniel Vetter <[e-mail]> wrote:
> >>> This tries to align with the X.org communities's long-standing
> >>> tradition of trying to be an inclusive community and handing out
> >>> commit rights fairly freely.
> >>>
> >>> We also tend to not revoke commit rights for people no longer
> >>> regularly active in a given project, as long as they're still part of
> >>> the larger community.
> >>>
> >>> Finally make sure that commit rights, like anything happening on fd.o
> >>> infrastructre, is subject to the fd.o's Code of Conduct.
> >>>
> >>> v2: Point at MAINTAINERS for contact info (Daniel S.)
> >>>
> >>> v3:
> >>> - Make it clear that commit rights are voluntary and that committers
> >>>   need to acknowledge positively when they're nominated by someone
> >>>   else (Keith).
> >>> - Encourage committers to drop their commit rights when they're no
> >>>   longer active, and make it clear they'll get readded (Keith).
> >>> - Add a line that maintainers and committers should actively nominate
> >>>   new committers (me).
> >>>
> >>> v4: Typo (Petri).
> >>>
> >>> v5: Typo (Sean).
> >>>
> >>> v6: Wording clarifications and spelling (Jani).
> >>>
> >>> v7: Require an explicit commitment to the documented merge criteria
> >>> and rules, instead of just the implied one through the Code of Conduct
> >>> threat (Jani).
> >>>
> >>> Acked-by: Alex Deucher <[e-mail]>
> >>> Acked-by: Arkadiusz Hiler <[e-mail]>
> >>> Acked-by: Daniel Stone <[e-mail]>
> >>> Acked-by: Eric Anholt <[e-mail]>
> >>> Acked-by: Gustavo Padovan <[e-mail]>
> >>> Acked-by: Petri Latvala <[e-mail]>
> >>> Cc: Alex Deucher <[e-mail]>
> >>> Cc: Arkadiusz Hiler <[e-mail]>
> >>> Cc: Ben Widawsky <[e-mail]>
> >>> Cc: Daniel Stone <[e-mail]>
> >>> Cc: Dave Airlie <[e-mail]>
> >>> Cc: Eric Anholt <[e-mail]>
> >>> Cc: Gustavo Padovan <[e-mail]>
> >>> Cc: Jani Nikula <[e-mail]>
> >>> Cc: Joonas Lahtinen <[e-mail]>
> >>> Cc: Keith Packard <[e-mail]>
> >>> Cc: Kenneth Graunke <[e-mail]>
> >>> Cc: Kristian H. Kristensen <[e-mail]>
> >>> Cc: Maarten Lankhorst <[e-mail]>
> >>> Cc: Petri Latvala <[e-mail]>
> >>> Cc: Rodrigo Vivi <[e-mail]>
> >>> Cc: Sean Paul <[e-mail]>
> >>> Reviewed-by: Keith Packard <[e-mail]>
> >>> Signed-off-by: Daniel Vetter <[e-mail]>
> >>> ---
> >>> If you wonder about the wide distribution list for an igt patch: I'd
> >>> like to start a discussions about x.org community norms around commit
> >>> rights at large, at least for all the shared repos. I plan to propose
> >>> the same text for drm-misc and libdrm too, and hopefully others like
> >>> mesa/xserver/wayland would follow.
> >>>
> >> I think the idea is pretty good, simply highlighting some bits.
> >>
> >> What you've outlined in this patch has been in practise for many years:
> >>  a) undocumented, applicable to most xorg projects [1]
> >>  b) documented, mesa
> >
> > Hm, I chatted with a few mesa devs about this, and I wasn't aware
> > there's explicit documentation for mesa. Where is it? I'd very much
> > want to align as much as we can.
> >
> See the "Developer git Access" section in [1]. FWIW I prefer the
> wording used in this patch and the CoC reference is a big plus.
> 
> HTH
> Emil
> 
> [1] https://www.mesa3d.org/repository.html

Ah missed this indeed. One thing to note wrt mesa is that this text here
relies heavily on _documented_ merge criteria. When I discussed it with
mesa we realized that the documented merge criteria do not really match
the actual criteria:

https://www.mesa3d.org/submittingpatches.html

E.g. for many drivers review is mandatory I think, same for core code. And
Intel folks require that you go through their CI too.

So the bigger part in adopting this for mesa would be in updating the
merge criteria doc to reflect reality.

Anyway, I'm happy that even the few terse lines match what I'm proposing
here (minus lots of details), I think we're good to go.
-Daniel

Patch

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 0180641be3aa..8a118134275c 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -51,4 +51,52 @@  A short list of contribution guidelines:
 - Changes to the testcases are automatically tested. Take the results into
   account before merging.
 
+Commit rights
+-------------
+
+Commit rights will be granted to anyone who requests them and fulfills the
+below criteria:
+
+- Submitted a few (5-10 as a rule of thumb) non-trivial (not just simple
+  spelling fixes and whitespace adjustment) patches that have been merged
+  already.
+
+- Are actively participating on discussions about their work (on the mailing
+  list or IRC). This should not be interpreted as a requirement to review other
+  peoples patches but just make sure that patch submission isn't one-way
+  communication. Cross-review is still highly encouraged.
+
+- Will be regularly contributing further patches. This includes regular
+  contributors to other parts of the open source graphics stack who only
+  do the oddball rare patch within igt itself.
+
+- Agrees to use their commit rights in accordance with the documented merge
+  criteria, tools, and processes.
+
+Apply for an account (and any other account change requests) through
+
+https://www.freedesktop.org/wiki/AccountRequests/
+
+and please ping the maintainers if your request is stuck.
+
+Committers are encouraged to request their commit rights get removed when they
+no longer contribute to the project. Commit rights will be reinstated when they
+come back to the project.
+
+Maintainers and committers should encourage contributors to request commit
+rights, especially junior contributors tend to underestimate their skills.
+
+Code of Conduct
+---------------
+
+Please be aware the fd.o Code of Conduct also applies to igt:
+
+https://www.freedesktop.org/wiki/CodeOfConduct/
+
+See the MAINTAINERS file for contact details of the igt maintainers.
+
+Abuse of commit rights, like engaging in commit fights or willfully pushing
+patches that violate the documented merge criteria, will also be handled through
+the Code of Conduct enforcement process.
+
 Happy hacking!