[PATCH 06/11] doc: consolidate code of conduct note to one place

[Jani Nikula]

Add new code of conduct file, also reference the kernel code of conduct.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 code-of-conduct.rst | 23 +++++++++++++++++++++++
 commit-access.rst   | 15 ---------------
 drm-misc.rst        | 13 -------------
 index.rst           |  1 +
 4 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 code-of-conduct.rst

diff --git a/code-of-conduct.rst b/code-of-conduct.rst
new file mode 100644
index 000000000000..75ce12ba86c1
--- /dev/null
+++ b/code-of-conduct.rst
@@ -0,0 +1,23 @@
+.. _code-of-conduct:
+
+=================
+ Code of Conduct
+=================
+
+Please be aware the freedesktop.org Code of Conduct applies to projects it
+hosts, including the drm subsystem, igt, maintainer tools, etc:
+
+https://www.freedesktop.org/wiki/CodeOfConduct/
+
+Please be aware also the kernel.org Code of Conduct applies to kernel
+development:
+
+https://www.kernel.org/code-of-conduct.html
+
+See the kernel MAINTAINERS file for contact details of the drm maintainers.
+
+Abuse of commit rights, like engaging in commit fights or willfully pushing
+patches that violate the documented merge criteria or process, will also be
+handled through the Code of Conduct enforcement process. Violations may lead to
+temporary or permanent account or commit rights suspension according to
+freedesktop.org umbrella rules.
diff --git a/commit-access.rst b/commit-access.rst
index 0bb9ec912535..923eaf359f71 100644
--- a/commit-access.rst
+++ b/commit-access.rst
@@ -104,18 +104,3 @@ reinstated when they come back to the project.
 
 Maintainers and committers should encourage contributors to request commit
 rights.
-
-Code of Conduct
-~~~~~~~~~~~~~~~
-
-Please be aware the freedesktop.org Code of Conduct also applies to i915:
-
-https://www.freedesktop.org/wiki/CodeOfConduct/
-
-See the MAINTAINERS file for contact details of the i915 maintainers.
-
-Abuse of commit rights, like engaging in commit fights or willfully pushing
-patches that violate the documented merge criteria or process, will also be
-handled through the Code of Conduct enforcement process. Violations may lead to
-temporary or permanent account or commit rights suspension according to
-freedesktop.org umbrella rules.
diff --git a/drm-misc.rst b/drm-misc.rst
index 8cd350596597..a0217bc78f1d 100644
--- a/drm-misc.rst
+++ b/drm-misc.rst
@@ -175,19 +175,6 @@ Maintainers mostly provide services to keep drm-misc running smoothly:
 * Take the blame when something goes wrong. Maintainers interface and represent
   the entire group of committers to the wider kernel community.
 
-Code of Conduct
-===============
-
-Please be aware the fd.o Code of Conduct also applies to drm-misc:
-
-https://www.freedesktop.org/wiki/CodeOfConduct/
-
-See the MAINTAINERS file for contact details of the drm-misc maintainers.
-
-Abuse of commit rights, like engaging in commit fights or willfully pushing
-patches that violate the documented merge criteria, will also be handled through
-the Code of Conduct enforcement process.
-
 Tooling
 =======
 
diff --git a/index.rst b/index.rst
index 0a9841f532b0..2a73f5de5bed 100644
--- a/index.rst
+++ b/index.rst
@@ -30,6 +30,7 @@ Contents:
    getting-started
    dim
    qf
+   code-of-conduct
    CONTRIBUTING
    MAINTAINERS
    COPYING
-- 
2.11.0