summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-05 17:30:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-05 17:30:44 -0700
commitbdc713bf5674bc6a881bd05c85e2a0f811b409b3 (patch)
tree7fc6e0fd5bcef8b2ba6837b7f7d451fc7c34625f
parent1062ae4982cabbf60f89b4e069fbb7def7edc8f7 (diff)
parent8676df503092dcdd757b1120fab03bfbce0ae1e7 (diff)
Merge tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux
Pull drm CoC pointer from Dave Airlie: "Small supplementary pull request. I didn't want anyone saying we snuck this in in a the middle of a big pile of changes, so here is a clearly separate pull request documenting the code of conduct introduced for freedesktop.org and how it relates to dri-devel community" * tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux: drm: Document code of conduct
-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.