drm: Document code of conduct
diff mbox

Message ID 20170411064815.5399-1-daniel.vetter@ffwll.ch
State New
Headers show

Commit Message

Daniel Vetter April 11, 2017, 6:48 a.m. UTC
freedesktop.org has adopted a formal&enforced code of conduct:

https://www.fooishbar.org/blog/fdo-contributor-covenant/
https://www.freedesktop.org/wiki/CodeOfConduct/

Besides formalizing things a bit more I don't think this changes
anything for us, we've already peer-enforced respectful and
constructive interactions since a long time. But it's good to document
things properly.

Note: As Daniel Stone mentioned in the announcement fd.o admins
started chatting with the communities their hosting, which includs the
X.org foundation board, to figure out how to fan out enforcement and
allow projects to run things on their own (with fd.o still as the
fallback).  So the details of enforcement (and appealing decisions)
might still change, but since this involves the board and lots more
people it'll take a while to get there. For now this is good enough I
think.

For the text itself I went with the same blurb as the Wayland project,
didn't feel creative yet this early in the morning:

https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c

Cc: Daniel Stone <daniels@collabora.com>
Cc: Keith Packard <keithp@keithp.com>
Cc: tfheen@err.no
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 Documentation/gpu/introduction.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Daniel Stone April 11, 2017, 7:08 a.m. UTC | #1
Hi,

On 11 April 2017 at 07:48, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.

All true.

Reviewed-by: Daniel Stone <daniels@collabora.com>

Cheers,
Daniel
Sumit Semwal April 11, 2017, 7:33 a.m. UTC | #2
On 11 April 2017 at 12:38, Daniel Stone <daniel@fooishbar.org> wrote:
> Hi,
>
> On 11 April 2017 at 07:48, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>> Note: As Daniel Stone mentioned in the announcement fd.o admins
>> started chatting with the communities their hosting, which includs the
>> X.org foundation board, to figure out how to fan out enforcement and
>> allow projects to run things on their own (with fd.o still as the
>> fallback).  So the details of enforcement (and appealing decisions)
>> might still change, but since this involves the board and lots more
>> people it'll take a while to get there. For now this is good enough I
>> think.
>
> All true.
>
> Reviewed-by: Daniel Stone <daniels@collabora.com>
>
Thanks for this, Daniel!

Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org>

Best,
Sumit.

> Cheers,
> Daniel
Archit Taneja April 11, 2017, 7:51 a.m. UTC | #3
On 04/11/2017 01:03 PM, Sumit Semwal wrote:
> On 11 April 2017 at 12:38, Daniel Stone <daniel@fooishbar.org> wrote:
>> Hi,
>>
>> On 11 April 2017 at 07:48, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>>> Note: As Daniel Stone mentioned in the announcement fd.o admins
>>> started chatting with the communities their hosting, which includs the
>>> X.org foundation board, to figure out how to fan out enforcement and
>>> allow projects to run things on their own (with fd.o still as the
>>> fallback).  So the details of enforcement (and appealing decisions)
>>> might still change, but since this involves the board and lots more
>>> people it'll take a while to get there. For now this is good enough I
>>> think.
>>
>> All true.
>>
>> Reviewed-by: Daniel Stone <daniels@collabora.com>
>>
> Thanks for this, Daniel!
>
> Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org>

Acked-by: Archit Taneja <architt@codeaurora.org>

Thanks,
Archit

>
> Best,
> Sumit.
>
>> Cheers,
>> Daniel
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
Martin Peres April 11, 2017, 8:25 a.m. UTC | #4
On 11/04/17 10:51, Archit Taneja wrote:
>
>
> On 04/11/2017 01:03 PM, Sumit Semwal wrote:
>> On 11 April 2017 at 12:38, Daniel Stone <daniel@fooishbar.org> wrote:
>>> Hi,
>>>
>>> On 11 April 2017 at 07:48, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>>>> Note: As Daniel Stone mentioned in the announcement fd.o admins
>>>> started chatting with the communities their hosting, which includs the
>>>> X.org foundation board, to figure out how to fan out enforcement and
>>>> allow projects to run things on their own (with fd.o still as the
>>>> fallback).  So the details of enforcement (and appealing decisions)
>>>> might still change, but since this involves the board and lots more
>>>> people it'll take a while to get there. For now this is good enough I
>>>> think.
>>>
>>> All true.
>>>
>>> Reviewed-by: Daniel Stone <daniels@collabora.com>
>>>
>> Thanks for this, Daniel!
>>
>> Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org>
>
> Acked-by: Archit Taneja <architt@codeaurora.org>

Thanks for doing this, this was long overdue!

Reviewed-by: Martin Peres <martin.peres@free.fr>
Daniel Vetter April 11, 2017, 9:03 a.m. UTC | #5
On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
> 
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
> 
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
> 
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
> 
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
> 
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
> 
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
> index 05a82bdfbca4..0f5173e29bdc 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>  can't be merged. The recommended way to deal with that is having a -next tree
>  that's always open, but making sure to not feed it into linux-next during the
>  blackout period. As an example, drm-misc works like that.
> +
> +Code of Conduct
> +---------------
> +
> +As a freedesktop.org project, dri-devel and the DRM community follows the
> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct

Chris pointed out on irc that the grammar went a bit wrong here. I'll fix
this to 

"As a freedesktop.org project, dri-devel, and the DRM community, follows
the Contributor Covenant, ..."

when applying.
-Daniel

> +
> +Please conduct yourself in a respectful and civilised manner when
> +interacting with community members on mailing lists, IRC, or bug
> +trackers. The community represents the project as a whole, and abusive
> +or bullying behaviour is not tolerated by the project.
> -- 
> 2.11.0
>
Chris Wilson April 11, 2017, 9:09 a.m. UTC | #6
On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
> 
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
> 
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
> 
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
> 
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
> 
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
> 
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
> index 05a82bdfbca4..0f5173e29bdc 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>  can't be merged. The recommended way to deal with that is having a -next tree
>  that's always open, but making sure to not feed it into linux-next during the
>  blackout period. As an example, drm-misc works like that.
> +
> +Code of Conduct
> +---------------
> +
> +As a freedesktop.org project, dri-devel and the DRM community follows the

s/follows/follow/ (I think at least)

> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
> +
> +Please conduct yourself in a respectful and civilised manner when
> +interacting with community members on mailing lists, IRC, or bug
> +trackers. The community represents the project as a whole, and abusive
> +or bullying behaviour is not tolerated by the project.

Self-englightened Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
Thierry Reding April 11, 2017, 9:19 a.m. UTC | #7
On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
> 
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
> 
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
> 
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
> 
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
> 
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
> 
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)

Acked-by: Thierry Reding <treding@nvidia.com>
Jani Nikula April 11, 2017, 9:24 a.m. UTC | #8
On Tue, 11 Apr 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
>
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
>
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
>
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
>
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
>
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
>
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Acked-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
> index 05a82bdfbca4..0f5173e29bdc 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>  can't be merged. The recommended way to deal with that is having a -next tree
>  that's always open, but making sure to not feed it into linux-next during the
>  blackout period. As an example, drm-misc works like that.
> +
> +Code of Conduct
> +---------------
> +
> +As a freedesktop.org project, dri-devel and the DRM community follows the
> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
> +
> +Please conduct yourself in a respectful and civilised manner when
> +interacting with community members on mailing lists, IRC, or bug
> +trackers. The community represents the project as a whole, and abusive
> +or bullying behaviour is not tolerated by the project.
Vincent Abriou April 11, 2017, 9:43 a.m. UTC | #9
On 04/11/2017 08:48 AM, Daniel Vetter wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:

>

> https://www.fooishbar.org/blog/fdo-contributor-covenant/

> https://www.freedesktop.org/wiki/CodeOfConduct/

>

> Besides formalizing things a bit more I don't think this changes

> anything for us, we've already peer-enforced respectful and

> constructive interactions since a long time. But it's good to document

> things properly.

>

> Note: As Daniel Stone mentioned in the announcement fd.o admins

> started chatting with the communities their hosting, which includs the

> X.org foundation board, to figure out how to fan out enforcement and

> allow projects to run things on their own (with fd.o still as the

> fallback).  So the details of enforcement (and appealing decisions)

> might still change, but since this involves the board and lots more

> people it'll take a while to get there. For now this is good enough I

> think.

>

> For the text itself I went with the same blurb as the Wayland project,

> didn't feel creative yet this early in the morning:

>

> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c

>

> Cc: Daniel Stone <daniels@collabora.com>

> Cc: Keith Packard <keithp@keithp.com>

> Cc: tfheen@err.no

> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

> ---

>  Documentation/gpu/introduction.rst | 11 +++++++++++

>  1 file changed, 11 insertions(+)

>

> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst

> index 05a82bdfbca4..0f5173e29bdc 100644

> --- a/Documentation/gpu/introduction.rst

> +++ b/Documentation/gpu/introduction.rst

> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work

>  can't be merged. The recommended way to deal with that is having a -next tree

>  that's always open, but making sure to not feed it into linux-next during the

>  blackout period. As an example, drm-misc works like that.

> +

> +Code of Conduct

> +---------------

> +

> +As a freedesktop.org project, dri-devel and the DRM community follows the

> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct

> +

> +Please conduct yourself in a respectful and civilised manner when

> +interacting with community members on mailing lists, IRC, or bug

> +trackers. The community represents the project as a whole, and abusive

> +or bullying behaviour is not tolerated by the project.

>


Acked-by: Vincent Abriou <vincent.abriou@st.com>
Neil Armstrong April 11, 2017, 9:52 a.m. UTC | #10
On 04/11/2017 11:03 AM, Daniel Vetter wrote:
> On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
>> freedesktop.org has adopted a formal&enforced code of conduct:
>>
>> https://www.fooishbar.org/blog/fdo-contributor-covenant/
>> https://www.freedesktop.org/wiki/CodeOfConduct/
>>
>> Besides formalizing things a bit more I don't think this changes
>> anything for us, we've already peer-enforced respectful and
>> constructive interactions since a long time. But it's good to document
>> things properly.
>>
>> Note: As Daniel Stone mentioned in the announcement fd.o admins
>> started chatting with the communities their hosting, which includs the
>> X.org foundation board, to figure out how to fan out enforcement and
>> allow projects to run things on their own (with fd.o still as the
>> fallback).  So the details of enforcement (and appealing decisions)
>> might still change, but since this involves the board and lots more
>> people it'll take a while to get there. For now this is good enough I
>> think.
>>
>> For the text itself I went with the same blurb as the Wayland project,
>> didn't feel creative yet this early in the morning:
>>
>> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
>>
>> Cc: Daniel Stone <daniels@collabora.com>
>> Cc: Keith Packard <keithp@keithp.com>
>> Cc: tfheen@err.no
>> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>> ---
>>  Documentation/gpu/introduction.rst | 11 +++++++++++
>>  1 file changed, 11 insertions(+)
>>
>> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
>> index 05a82bdfbca4..0f5173e29bdc 100644
>> --- a/Documentation/gpu/introduction.rst
>> +++ b/Documentation/gpu/introduction.rst
>> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>>  can't be merged. The recommended way to deal with that is having a -next tree
>>  that's always open, but making sure to not feed it into linux-next during the
>>  blackout period. As an example, drm-misc works like that.
>> +
>> +Code of Conduct
>> +---------------
>> +
>> +As a freedesktop.org project, dri-devel and the DRM community follows the
>> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
> 
> Chris pointed out on irc that the grammar went a bit wrong here. I'll fix
> this to 
> 
> "As a freedesktop.org project, dri-devel, and the DRM community, follows
> the Contributor Covenant, ..."
> 
> when applying.
> -Daniel
> 
>> +
>> +Please conduct yourself in a respectful and civilised manner when
>> +interacting with community members on mailing lists, IRC, or bug
>> +trackers. The community represents the project as a whole, and abusive
>> +or bullying behaviour is not tolerated by the project.
>> -- 
>> 2.11.0

Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Maarten Lankhorst April 11, 2017, 10:01 a.m. UTC | #11
Op 11-04-17 om 08:48 schreef Daniel Vetter:
> freedesktop.org has adopted a formal&enforced code of conduct:
>
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
>
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
>
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
>
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
>
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
>
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
> index 05a82bdfbca4..0f5173e29bdc 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>  can't be merged. The recommended way to deal with that is having a -next tree
>  that's always open, but making sure to not feed it into linux-next during the
>  blackout period. As an example, drm-misc works like that.
> +
> +Code of Conduct
> +---------------
> +
> +As a freedesktop.org project, dri-devel and the DRM community follows the
> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
> +
> +Please conduct yourself in a respectful and civilised manner when
> +interacting with community members on mailing lists, IRC, or bug
> +trackers. The community represents the project as a whole, and abusive
> +or bullying behaviour is not tolerated by the project.

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Brian Starkey April 11, 2017, 10:04 a.m. UTC | #12
On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
>freedesktop.org has adopted a formal&enforced code of conduct:
>
>https://www.fooishbar.org/blog/fdo-contributor-covenant/
>https://www.freedesktop.org/wiki/CodeOfConduct/
>
>Besides formalizing things a bit more I don't think this changes
>anything for us, we've already peer-enforced respectful and
>constructive interactions since a long time. But it's good to document
>things properly.
>
>Note: As Daniel Stone mentioned in the announcement fd.o admins
>started chatting with the communities their hosting, which includs the
>X.org foundation board, to figure out how to fan out enforcement and
>allow projects to run things on their own (with fd.o still as the
>fallback).  So the details of enforcement (and appealing decisions)
>might still change, but since this involves the board and lots more
>people it'll take a while to get there. For now this is good enough I
>think.
>
>For the text itself I went with the same blurb as the Wayland project,
>didn't feel creative yet this early in the morning:
>
>https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
>
>Cc: Daniel Stone <daniels@collabora.com>
>Cc: Keith Packard <keithp@keithp.com>
>Cc: tfheen@err.no
>Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>---
> Documentation/gpu/introduction.rst | 11 +++++++++++
> 1 file changed, 11 insertions(+)

LGTM, thanks.

Acked-by: Brian Starkey <brian.starkey@arm.com>
Rob Clark April 11, 2017, 12:37 p.m. UTC | #13
On Tue, Apr 11, 2017 at 2:48 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
>
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
>
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
>
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.

s/includs/includes/

But spelling aside,

Acked-by: Rob Clark <robdclark@gmail.com>

> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
>
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
>
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
> index 05a82bdfbca4..0f5173e29bdc 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>  can't be merged. The recommended way to deal with that is having a -next tree
>  that's always open, but making sure to not feed it into linux-next during the
>  blackout period. As an example, drm-misc works like that.
> +
> +Code of Conduct
> +---------------
> +
> +As a freedesktop.org project, dri-devel and the DRM community follows the
> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
> +
> +Please conduct yourself in a respectful and civilised manner when
> +interacting with community members on mailing lists, IRC, or bug
> +trackers. The community represents the project as a whole, and abusive
> +or bullying behaviour is not tolerated by the project.
> --
> 2.11.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Luc Verhaegen April 11, 2017, 1:12 p.m. UTC | #14
On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
> 
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
> 
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
> 
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the

"started" and "chatting"? That is very weakly formulated.

> X.org foundation board, to figure out how to fan out enforcement and

This was not voted upon or even mentioned during the last board meeting. 
And i think the next board meeting is only in 2 days time. As such, this 
seems like it is not something that's officially sanctioned by the X.org 
foundation board, but you sure do try to make it sound like such.

Luc Verhaegen.
Daniel Vetter April 11, 2017, 1:24 p.m. UTC | #15
On Tue, Apr 11, 2017 at 3:12 PM, Luc Verhaegen <libv@skynet.be> wrote:
> On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
>> freedesktop.org has adopted a formal&enforced code of conduct:
>>
>> https://www.fooishbar.org/blog/fdo-contributor-covenant/
>> https://www.freedesktop.org/wiki/CodeOfConduct/
>>
>> Besides formalizing things a bit more I don't think this changes
>> anything for us, we've already peer-enforced respectful and
>> constructive interactions since a long time. But it's good to document
>> things properly.
>>
>> Note: As Daniel Stone mentioned in the announcement fd.o admins
>> started chatting with the communities their hosting, which includs the
>
> "started" and "chatting"? That is very weakly formulated.

Intentionally so ...

>> X.org foundation board, to figure out how to fan out enforcement and
>
> This was not voted upon or even mentioned during the last board meeting.
> And i think the next board meeting is only in 2 days time. As such, this
> seems like it is not something that's officially sanctioned by the X.org
> foundation board, but you sure do try to make it sound like such.

... because it is not yet sanctioned by the board in any way. So not
exactly sure where you're reading this into my commit message, because
it wasn't my intention to make it sounds like this is sanctioned by
the xorg board officially, nor did I state that anywhere. I just said
that discussions already started to happen, that's really all there
is.
-Daniel
Luc Verhaegen April 11, 2017, 1:30 p.m. UTC | #16
On Tue, Apr 11, 2017 at 03:24:04PM +0200, Daniel Vetter wrote:
> On Tue, Apr 11, 2017 at 3:12 PM, Luc Verhaegen <libv@skynet.be> wrote:
> > On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
> >> freedesktop.org has adopted a formal&enforced code of conduct:
> >>
> >> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> >> https://www.freedesktop.org/wiki/CodeOfConduct/
> >>
> >> Besides formalizing things a bit more I don't think this changes
> >> anything for us, we've already peer-enforced respectful and
> >> constructive interactions since a long time. But it's good to document
> >> things properly.
> >>
> >> Note: As Daniel Stone mentioned in the announcement fd.o admins
> >> started chatting with the communities their hosting, which includs the
> >
> > "started" and "chatting"? That is very weakly formulated.
> 
> Intentionally so ...
> 
> >> X.org foundation board, to figure out how to fan out enforcement and
> >
> > This was not voted upon or even mentioned during the last board meeting.
> > And i think the next board meeting is only in 2 days time. As such, this
> > seems like it is not something that's officially sanctioned by the X.org
> > foundation board, but you sure do try to make it sound like such.
> 
> ... because it is not yet sanctioned by the board in any way. So not
> exactly sure where you're reading this into my commit message, because
> it wasn't my intention to make it sounds like this is sanctioned by
> the xorg board officially, nor did I state that anywhere. I just said
> that discussions already started to happen, that's really all there
> is.

Thanks for making that clear.

Luc Verhaegen.
David Herrmann April 11, 2017, 1:35 p.m. UTC | #17
Hey

On Tue, Apr 11, 2017 at 8:48 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
>
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
>
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
>
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
>
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
>
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
>
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Reviewed-by: David Herrmann <dh.herrmann@gmail.com>

Thanks
David

> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
> index 05a82bdfbca4..0f5173e29bdc 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>  can't be merged. The recommended way to deal with that is having a -next tree
>  that's always open, but making sure to not feed it into linux-next during the
>  blackout period. As an example, drm-misc works like that.
> +
> +Code of Conduct
> +---------------
> +
> +As a freedesktop.org project, dri-devel and the DRM community follows the
> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
> +
> +Please conduct yourself in a respectful and civilised manner when
> +interacting with community members on mailing lists, IRC, or bug
> +trackers. The community represents the project as a whole, and abusive
> +or bullying behaviour is not tolerated by the project.
> --
> 2.11.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel Vetter April 11, 2017, 1:36 p.m. UTC | #18
On Tue, Apr 11, 2017 at 3:30 PM, Luc Verhaegen <libv@skynet.be> wrote:
> On Tue, Apr 11, 2017 at 03:24:04PM +0200, Daniel Vetter wrote:
>> On Tue, Apr 11, 2017 at 3:12 PM, Luc Verhaegen <libv@skynet.be> wrote:
>> > On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
>> >> freedesktop.org has adopted a formal&enforced code of conduct:
>> >>
>> >> https://www.fooishbar.org/blog/fdo-contributor-covenant/
>> >> https://www.freedesktop.org/wiki/CodeOfConduct/
>> >>
>> >> Besides formalizing things a bit more I don't think this changes
>> >> anything for us, we've already peer-enforced respectful and
>> >> constructive interactions since a long time. But it's good to document
>> >> things properly.
>> >>
>> >> Note: As Daniel Stone mentioned in the announcement fd.o admins
>> >> started chatting with the communities their hosting, which includs the
>> >
>> > "started" and "chatting"? That is very weakly formulated.
>>
>> Intentionally so ...
>>
>> >> X.org foundation board, to figure out how to fan out enforcement and
>> >
>> > This was not voted upon or even mentioned during the last board meeting.
>> > And i think the next board meeting is only in 2 days time. As such, this
>> > seems like it is not something that's officially sanctioned by the X.org
>> > foundation board, but you sure do try to make it sound like such.
>>
>> ... because it is not yet sanctioned by the board in any way. So not
>> exactly sure where you're reading this into my commit message, because
>> it wasn't my intention to make it sounds like this is sanctioned by
>> the xorg board officially, nor did I state that anywhere. I just said
>> that discussions already started to happen, that's really all there
>> is.
>
> Thanks for making that clear.

Yeah I understand the confusion, since it wasn't clear that this mail
was written by me with my drm maintainer hat on, not me in my role as
xorg bod secretary. Nor me as an intel employee. I should have made
that clearer.
-Daniel
Luc Verhaegen April 11, 2017, 1:39 p.m. UTC | #19
On Tue, Apr 11, 2017 at 03:36:32PM +0200, Daniel Vetter wrote:
> On Tue, Apr 11, 2017 at 3:30 PM, Luc Verhaegen <libv@skynet.be> wrote:
> > On Tue, Apr 11, 2017 at 03:24:04PM +0200, Daniel Vetter wrote:
> >> On Tue, Apr 11, 2017 at 3:12 PM, Luc Verhaegen <libv@skynet.be> wrote:
> >> > On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
> >> >> freedesktop.org has adopted a formal&enforced code of conduct:
> >> >>
> >> >> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> >> >> https://www.freedesktop.org/wiki/CodeOfConduct/
> >> >>
> >> >> Besides formalizing things a bit more I don't think this changes
> >> >> anything for us, we've already peer-enforced respectful and
> >> >> constructive interactions since a long time. But it's good to document
> >> >> things properly.
> >> >>
> >> >> Note: As Daniel Stone mentioned in the announcement fd.o admins
> >> >> started chatting with the communities their hosting, which includs the
> >> >
> >> > "started" and "chatting"? That is very weakly formulated.
> >>
> >> Intentionally so ...
> >>
> >> >> X.org foundation board, to figure out how to fan out enforcement and
> >> >
> >> > This was not voted upon or even mentioned during the last board meeting.
> >> > And i think the next board meeting is only in 2 days time. As such, this
> >> > seems like it is not something that's officially sanctioned by the X.org
> >> > foundation board, but you sure do try to make it sound like such.
> >>
> >> ... because it is not yet sanctioned by the board in any way. So not
> >> exactly sure where you're reading this into my commit message, because
> >> it wasn't my intention to make it sounds like this is sanctioned by
> >> the xorg board officially, nor did I state that anywhere. I just said
> >> that discussions already started to happen, that's really all there
> >> is.
> >
> > Thanks for making that clear.
> 
> Yeah I understand the confusion, since it wasn't clear that this mail
> was written by me with my drm maintainer hat on, not me in my role as
> xorg bod secretary. Nor me as an intel employee. I should have made
> that clearer.

I was not confused about that, especially since you mentioned the board.
But this clearly was not something already approved by the X.org 
foundation board.

Luc Verhaegen.
Sean Paul April 11, 2017, 1:48 p.m. UTC | #20
On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
> 
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
> 
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
> 
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
> 
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
> 
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
> 
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Acked-by: Sean Paul <seanpaul@chromium.org>

> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
> index 05a82bdfbca4..0f5173e29bdc 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>  can't be merged. The recommended way to deal with that is having a -next tree
>  that's always open, but making sure to not feed it into linux-next during the
>  blackout period. As an example, drm-misc works like that.
> +
> +Code of Conduct
> +---------------
> +
> +As a freedesktop.org project, dri-devel and the DRM community follows the
> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
> +
> +Please conduct yourself in a respectful and civilised manner when
> +interacting with community members on mailing lists, IRC, or bug
> +trackers. The community represents the project as a whole, and abusive
> +or bullying behaviour is not tolerated by the project.
> -- 
> 2.11.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Jani Nikula April 11, 2017, 1:58 p.m. UTC | #21
On Tue, 11 Apr 2017, Luc Verhaegen <libv@skynet.be> wrote:
> On Tue, Apr 11, 2017 at 03:36:32PM +0200, Daniel Vetter wrote:
>> On Tue, Apr 11, 2017 at 3:30 PM, Luc Verhaegen <libv@skynet.be> wrote:
>> > On Tue, Apr 11, 2017 at 03:24:04PM +0200, Daniel Vetter wrote:
>> >> On Tue, Apr 11, 2017 at 3:12 PM, Luc Verhaegen <libv@skynet.be> wrote:
>> >> > On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
>> >> >> freedesktop.org has adopted a formal&enforced code of conduct:
>> >> >>
>> >> >> https://www.fooishbar.org/blog/fdo-contributor-covenant/
>> >> >> https://www.freedesktop.org/wiki/CodeOfConduct/
>> >> >>
>> >> >> Besides formalizing things a bit more I don't think this changes
>> >> >> anything for us, we've already peer-enforced respectful and
>> >> >> constructive interactions since a long time. But it's good to document
>> >> >> things properly.
>> >> >>
>> >> >> Note: As Daniel Stone mentioned in the announcement fd.o admins
>> >> >> started chatting with the communities their hosting, which includs the
>> >> >
>> >> > "started" and "chatting"? That is very weakly formulated.
>> >>
>> >> Intentionally so ...
>> >>
>> >> >> X.org foundation board, to figure out how to fan out enforcement and
>> >> >
>> >> > This was not voted upon or even mentioned during the last board meeting.
>> >> > And i think the next board meeting is only in 2 days time. As such, this
>> >> > seems like it is not something that's officially sanctioned by the X.org
>> >> > foundation board, but you sure do try to make it sound like such.
>> >>
>> >> ... because it is not yet sanctioned by the board in any way. So not
>> >> exactly sure where you're reading this into my commit message, because
>> >> it wasn't my intention to make it sounds like this is sanctioned by
>> >> the xorg board officially, nor did I state that anywhere. I just said
>> >> that discussions already started to happen, that's really all there
>> >> is.
>> >
>> > Thanks for making that clear.
>> 
>> Yeah I understand the confusion, since it wasn't clear that this mail
>> was written by me with my drm maintainer hat on, not me in my role as
>> xorg bod secretary. Nor me as an intel employee. I should have made
>> that clearer.
>
> I was not confused about that, especially since you mentioned the board.
> But this clearly was not something already approved by the X.org 
> foundation board.

Since there is a lot of "it" and "this" in both your and Daniel's
messages, without clarifying what you're both actually talking about, I
think for clarity it should be noted that, AFAIU, the decision to adopt
the CoC is up to the freedesktop.org admins, not the X.org board, and
the discussion about enforcing is to take place between the two.

BR,
Jani.
Luc Verhaegen April 11, 2017, 3:14 p.m. UTC | #22
On Tue, Apr 11, 2017 at 04:58:51PM +0300, Jani Nikula wrote:
> On Tue, 11 Apr 2017, Luc Verhaegen <libv@skynet.be> wrote:
> > On Tue, Apr 11, 2017 at 03:36:32PM +0200, Daniel Vetter wrote:
> >> On Tue, Apr 11, 2017 at 3:30 PM, Luc Verhaegen <libv@skynet.be> wrote:
> >> > On Tue, Apr 11, 2017 at 03:24:04PM +0200, Daniel Vetter wrote:
> >> >> On Tue, Apr 11, 2017 at 3:12 PM, Luc Verhaegen <libv@skynet.be> wrote:
> >> >> > On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
> >> >> >> freedesktop.org has adopted a formal&enforced code of conduct:
> >> >> >>
> >> >> >> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> >> >> >> https://www.freedesktop.org/wiki/CodeOfConduct/
> >> >> >>
> >> >> >> Besides formalizing things a bit more I don't think this changes
> >> >> >> anything for us, we've already peer-enforced respectful and
> >> >> >> constructive interactions since a long time. But it's good to document
> >> >> >> things properly.
> >> >> >>
> >> >> >> Note: As Daniel Stone mentioned in the announcement fd.o admins
> >> >> >> started chatting with the communities their hosting, which includs the
> >> >> >
> >> >> > "started" and "chatting"? That is very weakly formulated.
> >> >>
> >> >> Intentionally so ...
> >> >>
> >> >> >> X.org foundation board, to figure out how to fan out enforcement and
> >> >> >
> >> >> > This was not voted upon or even mentioned during the last board meeting.
> >> >> > And i think the next board meeting is only in 2 days time. As such, this
> >> >> > seems like it is not something that's officially sanctioned by the X.org
> >> >> > foundation board, but you sure do try to make it sound like such.
> >> >>
> >> >> ... because it is not yet sanctioned by the board in any way. So not
> >> >> exactly sure where you're reading this into my commit message, because
> >> >> it wasn't my intention to make it sounds like this is sanctioned by
> >> >> the xorg board officially, nor did I state that anywhere. I just said
> >> >> that discussions already started to happen, that's really all there
> >> >> is.
> >> >
> >> > Thanks for making that clear.
> >> 
> >> Yeah I understand the confusion, since it wasn't clear that this mail
> >> was written by me with my drm maintainer hat on, not me in my role as
> >> xorg bod secretary. Nor me as an intel employee. I should have made
> >> that clearer.
> >
> > I was not confused about that, especially since you mentioned the board.
> > But this clearly was not something already approved by the X.org 
> > foundation board.
> 
> Since there is a lot of "it" and "this" in both your and Daniel's
> messages, without clarifying what you're both actually talking about, I
> think for clarity it should be noted that, AFAIU, the decision to adopt
> the CoC is up to the freedesktop.org admins, not the X.org board, and
> the discussion about enforcing is to take place between the two.

It's the way in which this is being done that makes me very weary of 
this code of conduct.

It seems like a very unilateral move, quite likely by just a single 
person. There is no record of any prior discussion, not with the 
affected projects, not on any mailing list, not on the irc channels 
where i am on (and i doubt it is logged publicly anywhere). This commit 
Daniel Vetter just posted comes the closest to any discussion, wayland 
never was so lucky. This feels like the typical freedesktop.org move, 
and i am quite allergic to those as i and the projects i have been 
involved in have been the target of such unilateral decisions several 
times.

I see the mentioning of the X.org foundation board here as an attempt to 
give this surprise Code of Conduct some gravitas which it didn't 
deserve, as it was far too easily debunked. The board of directors never 
voted on this, and i would like to see the emails of the discussion 
prior to this mentioning here. If there were any, they were not before 
the surprise wayland commit.

I would welcome such a code of conduct though, if it had been the result 
of an honest, open and transparent community discussion. But that's not 
something i have often seen at freedesktop.org. And i have a feeling as 
to how it will be applied and who or what projects it will be applied 
to, and how transparent that process will be. If people would be 
interested in seeing this Code of Conduct retro-actively, i might have a 
few cases that i would want to bring up, though.

Luc Verhaegen.
Daniel Vetter April 11, 2017, 3:31 p.m. UTC | #23
On Tue, Apr 11, 2017 at 5:14 PM, Luc Verhaegen <libv@skynet.be> wrote:
> On Tue, Apr 11, 2017 at 04:58:51PM +0300, Jani Nikula wrote:
>> On Tue, 11 Apr 2017, Luc Verhaegen <libv@skynet.be> wrote:
>> > On Tue, Apr 11, 2017 at 03:36:32PM +0200, Daniel Vetter wrote:
>> >> On Tue, Apr 11, 2017 at 3:30 PM, Luc Verhaegen <libv@skynet.be> wrote:
>> >> > On Tue, Apr 11, 2017 at 03:24:04PM +0200, Daniel Vetter wrote:
>> >> >> On Tue, Apr 11, 2017 at 3:12 PM, Luc Verhaegen <libv@skynet.be> wrote:
>> >> >> > On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
>> >> >> >> freedesktop.org has adopted a formal&enforced code of conduct:
>> >> >> >>
>> >> >> >> https://www.fooishbar.org/blog/fdo-contributor-covenant/
>> >> >> >> https://www.freedesktop.org/wiki/CodeOfConduct/
>> >> >> >>
>> >> >> >> Besides formalizing things a bit more I don't think this changes
>> >> >> >> anything for us, we've already peer-enforced respectful and
>> >> >> >> constructive interactions since a long time. But it's good to document
>> >> >> >> things properly.
>> >> >> >>
>> >> >> >> Note: As Daniel Stone mentioned in the announcement fd.o admins
>> >> >> >> started chatting with the communities their hosting, which includs the
>> >> >> >
>> >> >> > "started" and "chatting"? That is very weakly formulated.
>> >> >>
>> >> >> Intentionally so ...
>> >> >>
>> >> >> >> X.org foundation board, to figure out how to fan out enforcement and
>> >> >> >
>> >> >> > This was not voted upon or even mentioned during the last board meeting.
>> >> >> > And i think the next board meeting is only in 2 days time. As such, this
>> >> >> > seems like it is not something that's officially sanctioned by the X.org
>> >> >> > foundation board, but you sure do try to make it sound like such.
>> >> >>
>> >> >> ... because it is not yet sanctioned by the board in any way. So not
>> >> >> exactly sure where you're reading this into my commit message, because
>> >> >> it wasn't my intention to make it sounds like this is sanctioned by
>> >> >> the xorg board officially, nor did I state that anywhere. I just said
>> >> >> that discussions already started to happen, that's really all there
>> >> >> is.
>> >> >
>> >> > Thanks for making that clear.
>> >>
>> >> Yeah I understand the confusion, since it wasn't clear that this mail
>> >> was written by me with my drm maintainer hat on, not me in my role as
>> >> xorg bod secretary. Nor me as an intel employee. I should have made
>> >> that clearer.
>> >
>> > I was not confused about that, especially since you mentioned the board.
>> > But this clearly was not something already approved by the X.org
>> > foundation board.
>>
>> Since there is a lot of "it" and "this" in both your and Daniel's
>> messages, without clarifying what you're both actually talking about, I
>> think for clarity it should be noted that, AFAIU, the decision to adopt
>> the CoC is up to the freedesktop.org admins, not the X.org board, and
>> the discussion about enforcing is to take place between the two.
>
> It's the way in which this is being done that makes me very weary of
> this code of conduct.
>
> It seems like a very unilateral move, quite likely by just a single
> person. There is no record of any prior discussion, not with the
> affected projects, not on any mailing list, not on the irc channels
> where i am on (and i doubt it is logged publicly anywhere). This commit
> Daniel Vetter just posted comes the closest to any discussion, wayland
> never was so lucky. This feels like the typical freedesktop.org move,
> and i am quite allergic to those as i and the projects i have been
> involved in have been the target of such unilateral decisions several
> times.
>
> I see the mentioning of the X.org foundation board here as an attempt to
> give this surprise Code of Conduct some gravitas which it didn't
> deserve, as it was far too easily debunked. The board of directors never
> voted on this, and i would like to see the emails of the discussion
> prior to this mentioning here. If there were any, they were not before
> the surprise wayland commit.
>
> I would welcome such a code of conduct though, if it had been the result
> of an honest, open and transparent community discussion. But that's not
> something i have often seen at freedesktop.org. And i have a feeling as
> to how it will be applied and who or what projects it will be applied
> to, and how transparent that process will be. If people would be
> interested in seeing this Code of Conduct retro-actively, i might have a
> few cases that i would want to bring up, though.

At least for the dri-devel community I have chatted with 20+ of the
regular contributors about this (in a specific case, which for obvious
reasons I don't want to discuss in the court of public opinion before
it's necessary), and only 2 went "meh, I don't care". Everyone else
seemed to support rolling out a formal&enforced code of conduct, so at
least for the dri-devel community I do believe that this has the full
support of the entire community. We will know this for sure over the
next few days, when the acks/r-b and potentially concerns roll in. I
have also discussed this with various folks at various conferences
since quite a while already.

I also don't think (again, in the context of dri-devel) that this
presents any change, when there's a heated discussions and e.g. Dave
or me go a bit too much into grumpy maintainer mode, other people
called us out and we tuned down and apologized (like everyone else).
So we live this CoC already, at least as I see it here. Overall I
think that at least for dri-devel this wasn't a surprise. But since it
is a bit a complicated topic, these discussions largely happened in
private over irc and at conferences, hence there's no record of them.

But again this is just about dri-devel, I can obviously not speak for
all the other communities on freedesktop.org. And the discussion
within x.org bod have only just started (in a more formal way on the
board@ list, I chatted with a few board members already in private of
course), so can't speak for the board either.
-Daniel
Harry Wentland April 11, 2017, 3:40 p.m. UTC | #24
On 2017-04-11 02:48 AM, Daniel Vetter wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
>
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
>
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
>
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
>
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
>
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
>
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
> index 05a82bdfbca4..0f5173e29bdc 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>  can't be merged. The recommended way to deal with that is having a -next tree
>  that's always open, but making sure to not feed it into linux-next during the
>  blackout period. As an example, drm-misc works like that.
> +
> +Code of Conduct
> +---------------
> +
> +As a freedesktop.org project, dri-devel and the DRM community follows the
> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
> +
> +Please conduct yourself in a respectful and civilised manner when
> +interacting with community members on mailing lists, IRC, or bug
> +trackers. The community represents the project as a whole, and abusive
> +or bullying behaviour is not tolerated by the project.
>
Alex Deucher April 11, 2017, 3:48 p.m. UTC | #25
On Tue, Apr 11, 2017 at 11:14 AM, Luc Verhaegen <libv@skynet.be> wrote:
> On Tue, Apr 11, 2017 at 04:58:51PM +0300, Jani Nikula wrote:
>> On Tue, 11 Apr 2017, Luc Verhaegen <libv@skynet.be> wrote:
>> > On Tue, Apr 11, 2017 at 03:36:32PM +0200, Daniel Vetter wrote:
>> >> On Tue, Apr 11, 2017 at 3:30 PM, Luc Verhaegen <libv@skynet.be> wrote:
>> >> > On Tue, Apr 11, 2017 at 03:24:04PM +0200, Daniel Vetter wrote:
>> >> >> On Tue, Apr 11, 2017 at 3:12 PM, Luc Verhaegen <libv@skynet.be> wrote:
>> >> >> > On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
>> >> >> >> freedesktop.org has adopted a formal&enforced code of conduct:
>> >> >> >>
>> >> >> >> https://www.fooishbar.org/blog/fdo-contributor-covenant/
>> >> >> >> https://www.freedesktop.org/wiki/CodeOfConduct/
>> >> >> >>
>> >> >> >> Besides formalizing things a bit more I don't think this changes
>> >> >> >> anything for us, we've already peer-enforced respectful and
>> >> >> >> constructive interactions since a long time. But it's good to document
>> >> >> >> things properly.
>> >> >> >>
>> >> >> >> Note: As Daniel Stone mentioned in the announcement fd.o admins
>> >> >> >> started chatting with the communities their hosting, which includs the
>> >> >> >
>> >> >> > "started" and "chatting"? That is very weakly formulated.
>> >> >>
>> >> >> Intentionally so ...
>> >> >>
>> >> >> >> X.org foundation board, to figure out how to fan out enforcement and
>> >> >> >
>> >> >> > This was not voted upon or even mentioned during the last board meeting.
>> >> >> > And i think the next board meeting is only in 2 days time. As such, this
>> >> >> > seems like it is not something that's officially sanctioned by the X.org
>> >> >> > foundation board, but you sure do try to make it sound like such.
>> >> >>
>> >> >> ... because it is not yet sanctioned by the board in any way. So not
>> >> >> exactly sure where you're reading this into my commit message, because
>> >> >> it wasn't my intention to make it sounds like this is sanctioned by
>> >> >> the xorg board officially, nor did I state that anywhere. I just said
>> >> >> that discussions already started to happen, that's really all there
>> >> >> is.
>> >> >
>> >> > Thanks for making that clear.
>> >>
>> >> Yeah I understand the confusion, since it wasn't clear that this mail
>> >> was written by me with my drm maintainer hat on, not me in my role as
>> >> xorg bod secretary. Nor me as an intel employee. I should have made
>> >> that clearer.
>> >
>> > I was not confused about that, especially since you mentioned the board.
>> > But this clearly was not something already approved by the X.org
>> > foundation board.
>>
>> Since there is a lot of "it" and "this" in both your and Daniel's
>> messages, without clarifying what you're both actually talking about, I
>> think for clarity it should be noted that, AFAIU, the decision to adopt
>> the CoC is up to the freedesktop.org admins, not the X.org board, and
>> the discussion about enforcing is to take place between the two.
>
> It's the way in which this is being done that makes me very weary of
> this code of conduct.
>
> It seems like a very unilateral move, quite likely by just a single
> person. There is no record of any prior discussion, not with the
> affected projects, not on any mailing list, not on the irc channels
> where i am on (and i doubt it is logged publicly anywhere). This commit
> Daniel Vetter just posted comes the closest to any discussion, wayland
> never was so lucky. This feels like the typical freedesktop.org move,
> and i am quite allergic to those as i and the projects i have been
> involved in have been the target of such unilateral decisions several
> times.

Isn't this thread the discussion?  Daniel proposed a code of conduct
for drm.  Let's discuss.  AFAIK, the previous discussion was mostly
just reaching out to various contributors to see if they were
interested in the first place.  I agree that the commit message
wording is confusing.

Alex

>
> I see the mentioning of the X.org foundation board here as an attempt to
> give this surprise Code of Conduct some gravitas which it didn't
> deserve, as it was far too easily debunked. The board of directors never
> voted on this, and i would like to see the emails of the discussion
> prior to this mentioning here. If there were any, they were not before
> the surprise wayland commit.
>
> I would welcome such a code of conduct though, if it had been the result
> of an honest, open and transparent community discussion. But that's not
> something i have often seen at freedesktop.org. And i have a feeling as
> to how it will be applied and who or what projects it will be applied
> to, and how transparent that process will be. If people would be
> interested in seeing this Code of Conduct retro-actively, i might have a
> few cases that i would want to bring up, though.
>
> Luc Verhaegen.
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Alex Deucher April 11, 2017, 3:50 p.m. UTC | #26
On Tue, Apr 11, 2017 at 2:48 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
>
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
>
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
>
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the

typos:
"they're" and "includes"

> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.

Might want to clarify this paragraph.  This is a bit confusing for
those not following the discussions closely.  I think there is too
much mixing of projects and hosting and foundations and all three
should be distinct.  This patch proposes a CoC for the drm subsystem
of the kernel, not freedesktop, or Xorg or some other project and that
should be made clear.

Alex

>
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
>
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
>
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
> index 05a82bdfbca4..0f5173e29bdc 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>  can't be merged. The recommended way to deal with that is having a -next tree
>  that's always open, but making sure to not feed it into linux-next during the
>  blackout period. As an example, drm-misc works like that.
> +
> +Code of Conduct
> +---------------
> +
> +As a freedesktop.org project, dri-devel and the DRM community follows the
> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
> +
> +Please conduct yourself in a respectful and civilised manner when
> +interacting with community members on mailing lists, IRC, or bug
> +trackers. The community represents the project as a whole, and abusive
> +or bullying behaviour is not tolerated by the project.
> --
> 2.11.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel Vetter April 11, 2017, 4:09 p.m. UTC | #27
On Tue, Apr 11, 2017 at 5:50 PM, Alex Deucher <alexdeucher@gmail.com> wrote:
> On Tue, Apr 11, 2017 at 2:48 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>> freedesktop.org has adopted a formal&enforced code of conduct:
>>
>> https://www.fooishbar.org/blog/fdo-contributor-covenant/
>> https://www.freedesktop.org/wiki/CodeOfConduct/
>>
>> Besides formalizing things a bit more I don't think this changes
>> anything for us, we've already peer-enforced respectful and
>> constructive interactions since a long time. But it's good to document
>> things properly.
>>
>> Note: As Daniel Stone mentioned in the announcement fd.o admins
>> started chatting with the communities their hosting, which includs the
>
> typos:
> "they're" and "includes"
>
>> X.org foundation board, to figure out how to fan out enforcement and
>> allow projects to run things on their own (with fd.o still as the
>> fallback).  So the details of enforcement (and appealing decisions)
>> might still change, but since this involves the board and lots more
>> people it'll take a while to get there. For now this is good enough I
>> think.
>
> Might want to clarify this paragraph.  This is a bit confusing for
> those not following the discussions closely.  I think there is too
> much mixing of projects and hosting and foundations and all three
> should be distinct.  This patch proposes a CoC for the drm subsystem
> of the kernel, not freedesktop, or Xorg or some other project and that
> should be made clear.

Yeah, looks like I mostly made a mess by trying to add a bit more
context. I'd say this note here really should have been below the
"---" to just make it part of the mail, not part of the commit
message. I think I'll just drop it when applying, I think that'd be
much better. Would also fix the typos in it :-)
-Daniel
Eric Anholt April 11, 2017, 4:19 p.m. UTC | #28
Daniel Vetter <daniel.vetter@ffwll.ch> writes:

> freedesktop.org has adopted a formal&enforced code of conduct:
>
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
>
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
>
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
>
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
>
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c

With the other wording nitpicks fixed,

Reviewed-by: Eric Anholt <eric@anholt.net>

I'm pleased to be part of a community that's working on building an
inclusive, welcoming, productive environment.
Alex Deucher April 11, 2017, 5:17 p.m. UTC | #29
On Tue, Apr 11, 2017 at 12:09 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> On Tue, Apr 11, 2017 at 5:50 PM, Alex Deucher <alexdeucher@gmail.com> wrote:
>> On Tue, Apr 11, 2017 at 2:48 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>>> freedesktop.org has adopted a formal&enforced code of conduct:
>>>
>>> https://www.fooishbar.org/blog/fdo-contributor-covenant/
>>> https://www.freedesktop.org/wiki/CodeOfConduct/
>>>
>>> Besides formalizing things a bit more I don't think this changes
>>> anything for us, we've already peer-enforced respectful and
>>> constructive interactions since a long time. But it's good to document
>>> things properly.
>>>
>>> Note: As Daniel Stone mentioned in the announcement fd.o admins
>>> started chatting with the communities their hosting, which includs the
>>
>> typos:
>> "they're" and "includes"
>>
>>> X.org foundation board, to figure out how to fan out enforcement and
>>> allow projects to run things on their own (with fd.o still as the
>>> fallback).  So the details of enforcement (and appealing decisions)
>>> might still change, but since this involves the board and lots more
>>> people it'll take a while to get there. For now this is good enough I
>>> think.
>>
>> Might want to clarify this paragraph.  This is a bit confusing for
>> those not following the discussions closely.  I think there is too
>> much mixing of projects and hosting and foundations and all three
>> should be distinct.  This patch proposes a CoC for the drm subsystem
>> of the kernel, not freedesktop, or Xorg or some other project and that
>> should be made clear.
>
> Yeah, looks like I mostly made a mess by trying to add a bit more
> context. I'd say this note here really should have been below the
> "---" to just make it part of the mail, not part of the commit
> message. I think I'll just drop it when applying, I think that'd be
> much better. Would also fix the typos in it :-)

With that fixed up:
Acked-by: Alex Deucher <alexander.deucher@amd.com>

> -Daniel
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Gustavo Padovan April 11, 2017, 5:28 p.m. UTC | #30
2017-04-11 Daniel Vetter <daniel.vetter@ffwll.ch>:

> freedesktop.org has adopted a formal&enforced code of conduct:
> 
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
> 
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
> 
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
> 
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
> 
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
> 
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)

That is a great step forward!

Acked-by: Gustavo Padovan <gustavo.padovan@collabora.com>

Gustavo
Michel Dänzer April 12, 2017, 9:26 a.m. UTC | #31
On 11/04/17 03:48 PM, Daniel Vetter wrote:
> freedesktop.org has adopted a formal&enforced code of conduct:
> 
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
> 
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
> 
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
> 
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
> 
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
> 
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  Documentation/gpu/introduction.rst | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
> index 05a82bdfbca4..0f5173e29bdc 100644
> --- a/Documentation/gpu/introduction.rst
> +++ b/Documentation/gpu/introduction.rst
> @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
>  can't be merged. The recommended way to deal with that is having a -next tree
>  that's always open, but making sure to not feed it into linux-next during the
>  blackout period. As an example, drm-misc works like that.
> +
> +Code of Conduct
> +---------------
> +
> +As a freedesktop.org project, dri-devel and the DRM community follows the
> +Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
> +
> +Please conduct yourself in a respectful and civilised manner when
> +interacting with community members on mailing lists, IRC, or bug
> +trackers. The community represents the project as a whole, and abusive
> +or bullying behaviour is not tolerated by the project.
> 

Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Laurent Pinchart April 12, 2017, 9:35 a.m. UTC | #32
Hi Daniel,

On Tuesday 11 Apr 2017 11:03:33 Daniel Vetter wrote:
> On Tue, Apr 11, 2017 at 08:48:15AM +0200, Daniel Vetter wrote:
> > freedesktop.org has adopted a formal&enforced code of conduct:
> > 
> > https://www.fooishbar.org/blog/fdo-contributor-covenant/
> > https://www.freedesktop.org/wiki/CodeOfConduct/
> > 
> > Besides formalizing things a bit more I don't think this changes
> > anything for us, we've already peer-enforced respectful and
> > constructive interactions since a long time. But it's good to document
> > things properly.
> > 
> > Note: As Daniel Stone mentioned in the announcement fd.o admins
> > started chatting with the communities their hosting, which includs the
> > X.org foundation board, to figure out how to fan out enforcement and
> > allow projects to run things on their own (with fd.o still as the
> > fallback).  So the details of enforcement (and appealing decisions)
> > might still change, but since this involves the board and lots more
> > people it'll take a while to get there. For now this is good enough I
> > think.
> > 
> > For the text itself I went with the same blurb as the Wayland project,
> > didn't feel creative yet this early in the morning:
> > 
> > https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409
> > b665a8b18cc7eb648c6c0c
> > 
> > Cc: Daniel Stone <daniels@collabora.com>
> > Cc: Keith Packard <keithp@keithp.com>
> > Cc: tfheen@err.no
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> > 
> >  Documentation/gpu/introduction.rst | 11 +++++++++++
> >  1 file changed, 11 insertions(+)
> > 
> > diff --git a/Documentation/gpu/introduction.rst
> > b/Documentation/gpu/introduction.rst index 05a82bdfbca4..0f5173e29bdc
> > 100644
> > --- a/Documentation/gpu/introduction.rst
> > +++ b/Documentation/gpu/introduction.rst
> > @@ -85,3 +85,14 @@ This means that there's a blackout-period of about one
> > month where feature work> 
> >  can't be merged. The recommended way to deal with that is having a -next
> >  tree that's always open, but making sure to not feed it into linux-next
> >  during the blackout period. As an example, drm-misc works like that.
> > 
> > +
> > +Code of Conduct
> > +---------------
> > +
> > +As a freedesktop.org project, dri-devel and the DRM community follows the
> > +Contributor Covenant, found at:
> > https://www.freedesktop.org/wiki/CodeOfConduct
> Chris pointed out on irc that the grammar went a bit wrong here. I'll fix
> this to
> 
> "As a freedesktop.org project, dri-devel, and the DRM community, follows
> the Contributor Covenant, ..."

s/follows/follow/ ?

Apart from that and the other small style and typo changes pointed out in this 
mail thread, with the X.org foundation board note dropped,

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> > +
> > +Please conduct yourself in a respectful and civilised manner when
> > +interacting with community members on mailing lists, IRC, or bug
> > +trackers. The community represents the project as a whole, and abusive
> > +or bullying behaviour is not tolerated by the project.
Sumit Semwal April 12, 2017, 12:59 p.m. UTC | #33
Hi Daniel,

On 11 April 2017 at 13:03, Sumit Semwal <sumit.semwal@linaro.org> wrote:
> On 11 April 2017 at 12:38, Daniel Stone <daniel@fooishbar.org> wrote:
>> Hi,
>>
>> On 11 April 2017 at 07:48, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>>> Note: As Daniel Stone mentioned in the announcement fd.o admins
>>> started chatting with the communities their hosting, which includs the
>>> X.org foundation board, to figure out how to fan out enforcement and
>>> allow projects to run things on their own (with fd.o still as the
>>> fallback).  So the details of enforcement (and appealing decisions)
>>> might still change, but since this involves the board and lots more
>>> people it'll take a while to get there. For now this is good enough I
>>> think.
>>
>> All true.
>>
>> Reviewed-by: Daniel Stone <daniels@collabora.com>
>>
And of course,
Acked-by: Sumit Semwal <sumit.semwal@linaro.org>
:)
> Thanks for this, Daniel!
>
> Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org>
>
> Best,
> Sumit.
>
>> Cheers,
>> Daniel
Keith Packard April 12, 2017, 1:34 p.m. UTC | #34
Daniel Vetter <daniel.vetter@ffwll.ch> writes:

> freedesktop.org has adopted a formal&enforced code of conduct:

Acked-by: Keith Packard <keithp@keithp.com>
Gabriel Krisman Bertazi April 14, 2017, 2:43 a.m. UTC | #35
Daniel Vetter <daniel.vetter@ffwll.ch> writes:

> freedesktop.org has adopted a formal&enforced code of conduct:
>
> https://www.fooishbar.org/blog/fdo-contributor-covenant/
> https://www.freedesktop.org/wiki/CodeOfConduct/
>
> Besides formalizing things a bit more I don't think this changes
> anything for us, we've already peer-enforced respectful and
> constructive interactions since a long time. But it's good to document
> things properly.
>
> Note: As Daniel Stone mentioned in the announcement fd.o admins
> started chatting with the communities their hosting, which includs the
> X.org foundation board, to figure out how to fan out enforcement and
> allow projects to run things on their own (with fd.o still as the
> fallback).  So the details of enforcement (and appealing decisions)
> might still change, but since this involves the board and lots more
> people it'll take a while to get there. For now this is good enough I
> think.
>
> For the text itself I went with the same blurb as the Wayland project,
> didn't feel creative yet this early in the morning:
>
> https://cgit.freedesktop.org/wayland/wayland/commit/?id=0eefe99fe0683ae409b665a8b18cc7eb648c6c0c
>
> Cc: Daniel Stone <daniels@collabora.com>
> Cc: Keith Packard <keithp@keithp.com>
> Cc: tfheen@err.no
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Acked-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>

Patch
diff mbox

diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst
index 05a82bdfbca4..0f5173e29bdc 100644
--- a/Documentation/gpu/introduction.rst
+++ b/Documentation/gpu/introduction.rst
@@ -85,3 +85,14 @@  This means that there's a blackout-period of about one month where feature work
 can't be merged. The recommended way to deal with that is having a -next tree
 that's always open, but making sure to not feed it into linux-next during the
 blackout period. As an example, drm-misc works like that.
+
+Code of Conduct
+---------------
+
+As a freedesktop.org project, dri-devel and the DRM community follows the
+Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
+
+Please conduct yourself in a respectful and civilised manner when
+interacting with community members on mailing lists, IRC, or bug
+trackers. The community represents the project as a whole, and abusive
+or bullying behaviour is not tolerated by the project.