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@xxxxxxxxxxxxx> >> Cc: Keith Packard <keithp@xxxxxxxxxx> >> Cc: tfheen@xxxxxx >> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> >> --- >> 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@xxxxxxxxxxxx> _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
