From 5b7cb5a11fc67142f95292a341581512093d5129 Mon Sep 17 00:00:00 2001 From: SteveHeist <42606649+SteveHeist@users.noreply.github.com> Date: Thu, 20 Sep 2018 18:32:44 -0700 Subject: [PATCH 1/3] Rewriting code-of-conduct.rst to pinch scope and define it better --- Documentation/process/code-of-conduct.rst | 81 +++++++---------------- 1 file changed, 23 insertions(+), 58 deletions(-) diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst index ab7c24b5478c6b3..6a51cc55664518f 100644 --- a/Documentation/process/code-of-conduct.rst +++ b/Documentation/process/code-of-conduct.rst @@ -1,81 +1,46 @@ -Contributor Covenant Code of Conduct -++++++++++++++++++++++++++++++++++++ +Pledge +====== -Our Pledge -========== - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, sex characteristics, gender identity and -expression, level of experience, education, socio-economic status, nationality, -personal appearance, race, religion, or sexual identity and orientation. - -Our Standards -============= +In the interest of fostering an effective, efficient, and constructive environment to further the advancement of the Linux kernel, we as contributors, maintainers, and involved users of said kernel pledge to remain topic focused and to view contributions without bias towards the contribution's origins, both of the person having designed the code, be it a physical, social, or mental condition, nor of the method of conception of the contribution, whether that's modification, reuse, or entirely new ideas. -Examples of behavior that contributes to creating a positive environment -include: +Standards +========= -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members +In an effort to keep the conversation surrounding the kernel about bettering the kernel itself, the following principals will be upheld: +1 - Any and all "ad hominem" attacks by *any* contributor can and will be disciplined, by methods including but not limited to suspension of contribution to the kernel, removal of commits, code, wiki edits, and issues which contain said attacks. -Examples of unacceptable behavior by participants include: +2 - Criticism shall remain constructive, if heated, and shall be applied to the contributions and codebase, and not to the person's physical, social, or mental condition. No contributor shall stand above another in a bureaucratic heirarchy, and all actions of discipline shall be taken based on severity by community-elected "moderators", whom, outside of disciplinary hearing, are not to be considered superior or senior to normal contributors. -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others’ private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting +3 - "Moderators" shall be elected by the community via a vote based on merit and consistent contributions to the kernel proper, and by no further means. No person shall be discriminated against based on race, gender, sexual orientation, or other physical, social, or mental conditions. By this manner, the kernel will be moderated by those who assist the kernel the most, and not by any other facet. +# - Kernel suspension shall not last longer than a term of one (1) year beyond the date of infraction. -Our Responsibilities -==================== +Responsibilities +================ -Maintainers are responsible for clarifying the standards of acceptable behavior -and are expected to take appropriate and fair corrective action in response to -any instances of unacceptable behavior. +Contributors are responsible for their attitude as displayed on github.com/torvalds/linux, and any disciplinary action will be taken based on the statements made by contributors only on github.com/torvalds/linux and it's various subdirectories. Statements made outside github.com/torvalds/linux, including emails, social media, and statements made in person between individuals, are not to be considered for potential disciplinary action and should instead be taken up with the administration of the platform used, whether that consists of social media moderators, event moderators, or email platforms. -Maintainers have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, or to ban temporarily or permanently any -contributor for other behaviors that they deem inappropriate, threatening, -offensive, or harmful. +Moderators are responsible for remaining a consistent and competent contributor to the Linux kernel, and to make fair and even judgement calls based on the actions of contributors as they stand currently. They are not to incite "witch hunts" or involve themselves in them, and doing so on github.com/torvalds/linux and it's various subdirectories can, will, and should result in immediate expulsion from moderation and maximum kernel contribution bans. Scope ===== -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. +As previously mentioned, this Code of Conduct applies solely within github.com/torvalds/linux and it's various subdirectories, except where this may be embedded in another project as example. Enforcement =========== -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the Technical Advisory Board (TAB) at -. All complaints will be reviewed and -investigated and will result in a response that is deemed necessary and -appropriate to the circumstances. The TAB is obligated to maintain -confidentiality with regard to the reporter of an incident. Further details of -specific enforcement policies may be posted separately. +As previously mentioned, enforcement of Standards and Responsiblity shall be handled by community-elected moderators, and punishment can include but is not limited to removal of contributions in issues, pull requests, and other areas, as well as temporary suspension of kernel contribution rights for up to a year, at the moderator's discretion. -Maintainers who do not follow or enforce the Code of Conduct in good faith may -face temporary or permanent repercussions as determined by other members of the -project’s leadership. +Upon implementation, this Code of Conduct shall not retroactively affect any contributor, and shall only affect actions made after the date of implementation, as written here: [Insert date of Implementation here]. Attribution =========== -This Code of Conduct is adapted from the Contributor Covenant, version 1.4, -available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html +This Code of Conduct was drafted by "SteveHeist" on Thursday, the 20th of September, to present as an alternative to the Code of Conduct adapted from the Contributor Covenant, which he believed to be written against the common interests of the contributors and the kernel, as evidenced by pull requests such as #593. + +Adjustment +========== + +Adjustment of this Code of Conduct, after implementation, can be made by suggesting as such in Issues, and at the discretion of community-elected moderators. Before implementation, this Code of Conduct can be adjusted and fitted as seen fit by the community at large, such that it will serve the entire community, rather than any interests against them. From 81e5e91d90196d3797b016b100bf407e4e24d891 Mon Sep 17 00:00:00 2001 From: SteveHeist <42606649+SteveHeist@users.noreply.github.com> Date: Sat, 22 Sep 2018 20:44:11 -0700 Subject: [PATCH 2/3] Spelling errors, and I missed the Linux Kernel Mailing List If you know how to format this to the LKML, do so for me please. I'm a clueless soul. --- Documentation/process/code-of-conduct.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst index 6a51cc55664518f..30c694d8634258a 100644 --- a/Documentation/process/code-of-conduct.rst +++ b/Documentation/process/code-of-conduct.rst @@ -6,7 +6,7 @@ In the interest of fostering an effective, efficient, and constructive environme Standards ========= -In an effort to keep the conversation surrounding the kernel about bettering the kernel itself, the following principals will be upheld: +In an effort to keep the conversation surrounding the kernel about bettering the kernel itself, the following principles will be upheld: 1 - Any and all "ad hominem" attacks by *any* contributor can and will be disciplined, by methods including but not limited to suspension of contribution to the kernel, removal of commits, code, wiki edits, and issues which contain said attacks. @@ -19,14 +19,14 @@ In an effort to keep the conversation surrounding the kernel about bettering the Responsibilities ================ -Contributors are responsible for their attitude as displayed on github.com/torvalds/linux, and any disciplinary action will be taken based on the statements made by contributors only on github.com/torvalds/linux and it's various subdirectories. Statements made outside github.com/torvalds/linux, including emails, social media, and statements made in person between individuals, are not to be considered for potential disciplinary action and should instead be taken up with the administration of the platform used, whether that consists of social media moderators, event moderators, or email platforms. +Contributors are responsible for their attitude as displayed on github.com/torvalds/linux and the Linux Kernel Mailing List, and any disciplinary action will be taken based on the statements made by contributors only on github.com/torvalds/linux, its various subdirectories, and the Linux Kernel Mailing List. Statements made outside the aforementioned area, including emails, social media, and statements made in person between individuals, are not to be considered for potential disciplinary action and should instead be taken up with the administration of the platform used, whether that consists of social media moderators, event moderators, or email platforms. -Moderators are responsible for remaining a consistent and competent contributor to the Linux kernel, and to make fair and even judgement calls based on the actions of contributors as they stand currently. They are not to incite "witch hunts" or involve themselves in them, and doing so on github.com/torvalds/linux and it's various subdirectories can, will, and should result in immediate expulsion from moderation and maximum kernel contribution bans. +Moderators are responsible for remaining a consistent and competent contributor to the Linux kernel, and to make fair and even judgement calls based on the actions of contributors as they stand currently. They are not to incite "witch hunts" or involve themselves in them, and doing so on github.com/torvalds/linux and its various subdirectories can, will, and should result in immediate expulsion from moderation and maximum kernel contribution bans. Scope ===== -As previously mentioned, this Code of Conduct applies solely within github.com/torvalds/linux and it's various subdirectories, except where this may be embedded in another project as example. +As previously mentioned, this Code of Conduct applies solely within github.com/torvalds/linux and its various subdirectories, except where this may be embedded in another project as example. Enforcement =========== From 4158c805653202da3fac1f4c338303ca47b1c4e1 Mon Sep 17 00:00:00 2001 From: SteveHeist <42606649+SteveHeist@users.noreply.github.com> Date: Mon, 24 Sep 2018 00:03:30 -0700 Subject: [PATCH 3/3] Update master list here to reflect gist sent to the mailing list. --- Documentation/process/code-of-conduct.rst | 43 ++++++++++++----------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst index 30c694d8634258a..d9327d9c4f326fd 100644 --- a/Documentation/process/code-of-conduct.rst +++ b/Documentation/process/code-of-conduct.rst @@ -1,46 +1,47 @@ -Pledge -====== +---Pledge--- -In the interest of fostering an effective, efficient, and constructive environment to further the advancement of the Linux kernel, we as contributors, maintainers, and involved users of said kernel pledge to remain topic focused and to view contributions without bias towards the contribution's origins, both of the person having designed the code, be it a physical, social, or mental condition, nor of the method of conception of the contribution, whether that's modification, reuse, or entirely new ideas. +In the interest of fostering an effective, efficient, and constructive environment to further the advancement of the Linux kernel, we as contributors, maintainers, and involved users of said kernel (in whole the "community") pledge to remain topic focused and to view contributions without bias towards the contribution's origins, both of the person having designed the code, be it a physical, social, or mental condition, nor of the method of conception of the contribution, whether that's modification of existing libre and free resources, reuse of effective code, or entirely self-designed and self-tested documentation. -Standards -========= +---Standards--- In an effort to keep the conversation surrounding the kernel about bettering the kernel itself, the following principles will be upheld: -1 - Any and all "ad hominem" attacks by *any* contributor can and will be disciplined, by methods including but not limited to suspension of contribution to the kernel, removal of commits, code, wiki edits, and issues which contain said attacks. +1 - Any and all "ad hominem" attacks by *any* contributor can and will be disciplined, by methods including but not limited to suspension of contribution to the kernel and removal or closing of the relevent commits, code, wiki edits, and issues. Relevancy is determined through a simple process by which the infringing examples are designated, and those deemed more infringement than use are removed. 2 - Criticism shall remain constructive, if heated, and shall be applied to the contributions and codebase, and not to the person's physical, social, or mental condition. No contributor shall stand above another in a bureaucratic heirarchy, and all actions of discipline shall be taken based on severity by community-elected "moderators", whom, outside of disciplinary hearing, are not to be considered superior or senior to normal contributors. -3 - "Moderators" shall be elected by the community via a vote based on merit and consistent contributions to the kernel proper, and by no further means. No person shall be discriminated against based on race, gender, sexual orientation, or other physical, social, or mental conditions. By this manner, the kernel will be moderated by those who assist the kernel the most, and not by any other facet. +3 - "Moderators" shall be elected by the community via a vote based on merit and consistent contributions to the kernel proper, and by no further means. No person shall be discriminated against based on race, gender, sexual orientation, or other physical, social, or mental conditions. By this manner, the kernel will be moderated by those who assist the kernel the most, and not by any other facet. "Moderators" can, and likely will, be a part of the Linux Foundation Technical Advisory Board, but involvement in the TAB is neither a necessity nor a requirement for "moderator" status. -# - Kernel suspension shall not last longer than a term of one (1) year beyond the date of infraction. +4 - In instances where moderators may abuse their power, the remaining moderators, a vote of the LF-TAB, or a request by the community at large, may remove their access to moderation capability. -Responsibilities -================ +# - Kernel suspension shall not last longer than a term of one (1) year beyond the date of infraction. This stands in place not as a punishment, but for the purpose of forcing a cooling period such that peace and civility may remain. -Contributors are responsible for their attitude as displayed on github.com/torvalds/linux and the Linux Kernel Mailing List, and any disciplinary action will be taken based on the statements made by contributors only on github.com/torvalds/linux, its various subdirectories, and the Linux Kernel Mailing List. Statements made outside the aforementioned area, including emails, social media, and statements made in person between individuals, are not to be considered for potential disciplinary action and should instead be taken up with the administration of the platform used, whether that consists of social media moderators, event moderators, or email platforms. +---Responsibilities--- -Moderators are responsible for remaining a consistent and competent contributor to the Linux kernel, and to make fair and even judgement calls based on the actions of contributors as they stand currently. They are not to incite "witch hunts" or involve themselves in them, and doing so on github.com/torvalds/linux and its various subdirectories can, will, and should result in immediate expulsion from moderation and maximum kernel contribution bans. +Contributors are responsible for their attitude as displayed on github.com/torvalds/linux, its subdirectories, and the Linux Kernel Mailing List, and any disciplinary action will be taken based on the statements made by contributors only on github.com/torvalds/linux, its various subdirectories, and the Linux Kernel Mailing List. Statements made outside the aformentioned locations, including emails, social media, and statements made in person between individuals, are not to be considered for potential disciplinary action and should instead be taken up with the administration of the platform used, whether that consists of social media moderators, event moderators, or email platforms. -Scope -===== +Moderators are responsible for remaining a consistent and competent contributor to the Linux kernel, and to make fair and even judgement calls based on the actions of contributors as they stand currently. Moderators are not to overstep their bounds, nor to attempt to use their position to sway the community in their favor. -As previously mentioned, this Code of Conduct applies solely within github.com/torvalds/linux and its various subdirectories, except where this may be embedded in another project as example. +---Scope--- -Enforcement -=========== +As previously mentioned, this Code of Conduct applies solely within github.com/torvalds/linux, its various subdirectories, and the Linux Kernel Mailing List, except where this may be embedded in another project as example. + +#To All Future Users: Recommend updating this to fit your project, if this document is taken as example for it. + +---Enforcement--- As previously mentioned, enforcement of Standards and Responsiblity shall be handled by community-elected moderators, and punishment can include but is not limited to removal of contributions in issues, pull requests, and other areas, as well as temporary suspension of kernel contribution rights for up to a year, at the moderator's discretion. Upon implementation, this Code of Conduct shall not retroactively affect any contributor, and shall only affect actions made after the date of implementation, as written here: [Insert date of Implementation here]. -Attribution -=========== +---Attribution--- This Code of Conduct was drafted by "SteveHeist" on Thursday, the 20th of September, to present as an alternative to the Code of Conduct adapted from the Contributor Covenant, which he believed to be written against the common interests of the contributors and the kernel, as evidenced by pull requests such as #593. -Adjustment -========== +---Adjustment--- Adjustment of this Code of Conduct, after implementation, can be made by suggesting as such in Issues, and at the discretion of community-elected moderators. Before implementation, this Code of Conduct can be adjusted and fitted as seen fit by the community at large, such that it will serve the entire community, rather than any interests against them. + +After the suggestion is agreed upon, it will be amended below these last lines, under the "Amendments" header, and shall enact itself accordingly. + +---Amendments---