Skip to content

Commit 8a104f8

Browse files
gregkhtorvalds
authored andcommitted
Code of Conduct: Let's revamp it.
The Code of Conflict is not achieving its implicit goal of fostering civility and the spirit of 'be excellent to each other'. Explicit guidelines have demonstrated success in other projects and other areas of the kernel. Here is a Code of Conduct statement for the wider kernel. It is based on the Contributor Covenant as described at www.contributor-covenant.org From this point forward, we should abide by these rules in order to help make the kernel community a welcoming environment to participate in. Signed-off-by: Chris Mason <[email protected]> Signed-off-by: Dan Williams <[email protected]> Signed-off-by: Jonathan Corbet <[email protected]> Signed-off-by: Olof Johansson <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 27c5a77 commit 8a104f8

File tree

3 files changed

+82
-29
lines changed

3 files changed

+82
-29
lines changed
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
Contributor Covenant Code of Conduct
2+
++++++++++++++++++++++++++++++++++++
3+
4+
Our Pledge
5+
==========
6+
7+
In the interest of fostering an open and welcoming environment, we as
8+
contributors and maintainers pledge to making participation in our project and
9+
our community a harassment-free experience for everyone, regardless of age, body
10+
size, disability, ethnicity, sex characteristics, gender identity and
11+
expression, level of experience, education, socio-economic status, nationality,
12+
personal appearance, race, religion, or sexual identity and orientation.
13+
14+
Our Standards
15+
=============
16+
17+
Examples of behavior that contributes to creating a positive environment
18+
include:
19+
20+
* Using welcoming and inclusive language
21+
* Being respectful of differing viewpoints and experiences
22+
* Gracefully accepting constructive criticism
23+
* Focusing on what is best for the community
24+
* Showing empathy towards other community members
25+
26+
27+
Examples of unacceptable behavior by participants include:
28+
29+
* The use of sexualized language or imagery and unwelcome sexual attention or
30+
advances
31+
* Trolling, insulting/derogatory comments, and personal or political attacks
32+
* Public or private harassment
33+
* Publishing others’ private information, such as a physical or electronic
34+
address, without explicit permission
35+
* Other conduct which could reasonably be considered inappropriate in a
36+
professional setting
37+
38+
39+
Our Responsibilities
40+
====================
41+
42+
Maintainers are responsible for clarifying the standards of acceptable behavior
43+
and are expected to take appropriate and fair corrective action in response to
44+
any instances of unacceptable behavior.
45+
46+
Maintainers have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, or to ban temporarily or permanently any
49+
contributor for other behaviors that they deem inappropriate, threatening,
50+
offensive, or harmful.
51+
52+
Scope
53+
=====
54+
55+
This Code of Conduct applies both within project spaces and in public spaces
56+
when an individual is representing the project or its community. Examples of
57+
representing a project or community include using an official project e-mail
58+
address, posting via an official social media account, or acting as an appointed
59+
representative at an online or offline event. Representation of a project may be
60+
further defined and clarified by project maintainers.
61+
62+
Enforcement
63+
===========
64+
65+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
66+
reported by contacting the Technical Advisory Board (TAB) at
67+
<[email protected]>. All complaints will be reviewed and
68+
investigated and will result in a response that is deemed necessary and
69+
appropriate to the circumstances. The TAB is obligated to maintain
70+
confidentiality with regard to the reporter of an incident. Further details of
71+
specific enforcement policies may be posted separately.
72+
73+
Maintainers who do not follow or enforce the Code of Conduct in good faith may
74+
face temporary or permanent repercussions as determined by other members of the
75+
project’s leadership.
76+
77+
Attribution
78+
===========
79+
80+
This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
81+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

Documentation/process/code-of-conflict.rst

Lines changed: 0 additions & 28 deletions
This file was deleted.

Documentation/process/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Below are the essential guides that every developer should read.
2020
:maxdepth: 1
2121

2222
howto
23-
code-of-conflict
23+
code-of-conduct
2424
development-process
2525
submitting-patches
2626
coding-style

0 commit comments

Comments
 (0)