aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-19 05:08:12 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-22 02:33:36 -0400
commitf3f76d640141e9a5aababafb80abbdc1c3c46823 (patch)
tree76cc4197c2ab85c4846b805f9865eb4b7d0ec041
parentd117a85478efaac1338c24c7504a6e759aaecdfc (diff)
Code of Conduct: Change the contact email address
The contact point for the kernel's Code of Conduct should now be the Code of Conduct Committee, not the full TAB. Change the email address in the file to properly reflect this. Acked-by: Chris Mason <clm@fb.com> Acked-by: Olof Johansson <olof@lixom.net> Acked-by: Theodore Ts'o <tytso@mit.edu> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--Documentation/process/code-of-conduct.rst13
1 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst
index 3046664c929e..be50294aebd5 100644
--- a/Documentation/process/code-of-conduct.rst
+++ b/Documentation/process/code-of-conduct.rst
@@ -65,12 +65,13 @@ Enforcement
65=========== 65===========
66 66
67Instances of abusive, harassing, or otherwise unacceptable behavior may be 67Instances of abusive, harassing, or otherwise unacceptable behavior may be
68reported by contacting the Technical Advisory Board (TAB) at 68reported by contacting the Code of Conduct Committee at
69<tab@lists.linux-foundation.org>. All complaints will be reviewed and 69<conduct@kernel.org>. All complaints will be reviewed and investigated
70investigated and will result in a response that is deemed necessary and 70and will result in a response that is deemed necessary and appropriate
71appropriate to the circumstances. The TAB is obligated to maintain 71to the circumstances. The Code of Conduct Committee is obligated to
72confidentiality with regard to the reporter of an incident. Further details of 72maintain confidentiality with regard to the reporter of an incident.
73specific enforcement policies may be posted separately. 73Further details of specific enforcement policies may be posted
74separately.
74 75
75Attribution 76Attribution
76=========== 77===========