From: Daniel Vetter Date: Tue, 18 Apr 2017 10:10:57 +0000 (+0200) Subject: drm: Document code of conduct X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8676df503092dcdd757b1120fab03bfbce0ae1e7;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git drm: Document code of conduct 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. v2: Drop confusing note from commit message and clarify the grammer (Chris, Alex and others). Cc: Daniel Stone Cc: Keith Packard Cc: tfheen@err.no Signed-off-by: Daniel Vetter Reviewed-by: Daniel Stone Reviewed-by: Sumit Semwal Acked-by: Archit Taneja Reviewed-by: Martin Peres Acked-by: Thierry Reding Acked-by: Jani Nikula Acked-by: Vincent Abriou Acked-by: Neil Armstrong Reviewed-by: Maarten Lankhorst Acked-by: Brian Starkey Acked-by: Rob Clark Reviewed-by: David Herrmann Acked-by: Sean Paul Reviewed-by: Harry Wentland Reviewed-by: Eric Anholt Acked-by: Alex Deucher Acked-by: Gustavo Padovan Acked-by: Michel Dänzer Acked-by: Laurent Pinchart Acked-by: Sumit Semwal Acked-by: Keith Packard Acked-by: Gabriel Krisman Bertazi Acked-by: Adam Jackson Signed-off-by: Dave Airlie --- diff --git a/Documentation/gpu/introduction.rst b/Documentation/gpu/introduction.rst index 05a82bdfbca4..fccbe375244d 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.