aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <[email protected]>2017-04-18 12:10:57 +0200
committerDave Airlie <[email protected]>2017-05-05 11:48:17 +1000
commit8676df503092dcdd757b1120fab03bfbce0ae1e7 (patch)
tree83f09a5f5222ef0a2442561c97e8dabc8dce0f76
parent8b03d1ed2c43a2ba5ef3381322ee4515b97381bf (diff)
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 <[email protected]> Cc: Keith Packard <[email protected]> Cc: [email protected] Signed-off-by: Daniel Vetter <[email protected]> Reviewed-by: Daniel Stone <[email protected]> Reviewed-by: Sumit Semwal <[email protected]> Acked-by: Archit Taneja <[email protected]> Reviewed-by: Martin Peres <[email protected]> Acked-by: Thierry Reding <[email protected]> Acked-by: Jani Nikula <[email protected]> Acked-by: Vincent Abriou <[email protected]> Acked-by: Neil Armstrong <[email protected]> Reviewed-by: Maarten Lankhorst <[email protected]> Acked-by: Brian Starkey <[email protected]> Acked-by: Rob Clark <[email protected]> Reviewed-by: David Herrmann <[email protected]> Acked-by: Sean Paul <[email protected]> Reviewed-by: Harry Wentland <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Acked-by: Alex Deucher <[email protected]> Acked-by: Gustavo Padovan <[email protected]> Acked-by: Michel Dänzer <[email protected]> Acked-by: Laurent Pinchart <[email protected]> Acked-by: Sumit Semwal <[email protected]> Acked-by: Keith Packard <[email protected]> Acked-by: Gabriel Krisman Bertazi <[email protected]> Acked-by: Adam Jackson <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
-rw-r--r--Documentation/gpu/introduction.rst11
1 files changed, 11 insertions, 0 deletions
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.