Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 <clm@fb.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Olof Johansson <olof@lxom.net>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Greg Kroah-Hartman and committed by
Linus Torvalds
8a104f8b 27c5a778

+82 -29
+81
Documentation/process/code-of-conduct.rst
··· 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 + <tab@lists.linux-foundation.org>. 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
-28
Documentation/process/code-of-conflict.rst
··· 1 - Code of Conflict 2 - ---------------- 3 - 4 - The Linux kernel development effort is a very personal process compared 5 - to "traditional" ways of developing software. Your code and ideas 6 - behind it will be carefully reviewed, often resulting in critique and 7 - criticism. The review will almost always require improvements to the 8 - code before it can be included in the kernel. Know that this happens 9 - because everyone involved wants to see the best possible solution for 10 - the overall success of Linux. This development process has been proven 11 - to create the most robust operating system kernel ever, and we do not 12 - want to do anything to cause the quality of submission and eventual 13 - result to ever decrease. 14 - 15 - If however, anyone feels personally abused, threatened, or otherwise 16 - uncomfortable due to this process, that is not acceptable. If so, 17 - please contact the Linux Foundation's Technical Advisory Board at 18 - <tab@lists.linux-foundation.org>, or the individual members, and they 19 - will work to resolve the issue to the best of their ability. For more 20 - information on who is on the Technical Advisory Board and what their 21 - role is, please see: 22 - 23 - - http://www.linuxfoundation.org/projects/linux/tab 24 - 25 - As a reviewer of code, please strive to keep things civil and focused on 26 - the technical issues involved. We are all humans, and frustrations can 27 - be high on both sides of the process. Try to keep in mind the immortal 28 - words of Bill and Ted, "Be excellent to each other."
+1 -1
Documentation/process/index.rst
··· 20 20 :maxdepth: 1 21 21 22 22 howto 23 - code-of-conflict 23 + code-of-conduct 24 24 development-process 25 25 submitting-patches 26 26 coding-style