From: James Bottomley <James.Bottomley@HansenPartnership.com> To: Andrew Morton <akpm@linux-foundation.org>, Linus Torvalds <torvalds@linux-foundation.org>, Greg Kroah-Hartman <greg@kroah.com> Cc: linux-kernel <linux-kernel@vger.kernel.org>, ksummit-discuss@lists.linuxfoundation.org Subject: [Ksummit-discuss] [GIT PULL] code of conduct fixes for 4.19-rc8 Date: Sat, 20 Oct 2018 13:15:14 -0700 [thread overview] Message-ID: <1540066514.3464.22.camel@HansenPartnership.com> (raw) This is the series of patches which has been discussed on both ksummit- discuss and linux-kernel for the past few weeks. As Shuah said when kicking off the process, it's designed as a starting point for the next phase of the discussion, not as the end point, so it's only really a set of minor updates to further that goal. The merger of the three patches to show the combined effect is attached below. However, Greg recently posted the next phase of the discussion, so people will be asking what the merger of the series looks like. Ignoring the non-CoC documents, I think it looks like this --- diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst index eec768471a4d..8913851dab89 100644 --- a/Documentation/process/code-of-conduct.rst +++ b/Documentation/process/code-of-conduct.rst @@ -59,19 +59,27 @@ 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. -Reporting -========= +Enforcement +=========== Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the Technical Advisory Board (TAB) at -<tab@lists.linux-foundation.org>. 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 (except where -required by law). +reported by contacting the Code of Conduct Committee at +<conduct@kernel.org>. All complaints will be reviewed and investigated +and will result in a response that is deemed necessary and appropriate +to the circumstances. The Code of Conduct Committee is obligated to +maintain confidentiality with regard to the reporter of an incident +(except where required by law). Further details of specific enforcement +policies may be posted separately. + 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 + +Interpretation +============== + +See the :ref:`code_of_conduct_interpretation` document for how the Linux +kernel community will be interpreting this document. --- And I'm sure it can be rebased to this without disturbing the currently gathered tags. The patch can be pulled from git://git.kernel.org/pub/scm/linux/kernel/git/jejb/linux-coc.git coc-fixes With the diffstat: Documentation/process/code-of-conduct.rst | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) With full diff below. James --- diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst index ab7c24b5478c..eec768471a4d 100644 --- a/Documentation/process/code-of-conduct.rst +++ b/Documentation/process/code-of-conduct.rst @@ -31,7 +31,7 @@ Examples of unacceptable behavior by participants include: * 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 + address not ordinarily collected by the project, without explicit permission * Other conduct which could reasonably be considered inappropriate in a professional setting @@ -59,20 +59,16 @@ 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. -Enforcement -=========== +Reporting +========= Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Technical Advisory Board (TAB) at <tab@lists.linux-foundation.org>. 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. - -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. +confidentiality with regard to the reporter of an incident (except where +required by law). Attribution ===========
WARNING: multiple messages have this Message-ID (diff)
From: James Bottomley <James.Bottomley@HansenPartnership.com> To: Andrew Morton <akpm@linux-foundation.org>, Linus Torvalds <torvalds@linux-foundation.org>, Greg Kroah-Hartman <greg@kroah.com> Cc: linux-kernel <linux-kernel@vger.kernel.org>, ksummit-discuss@lists.linuxfoundation.org Subject: [GIT PULL] code of conduct fixes for 4.19-rc8 Date: Sat, 20 Oct 2018 13:15:14 -0700 [thread overview] Message-ID: <1540066514.3464.22.camel@HansenPartnership.com> (raw) This is the series of patches which has been discussed on both ksummit- discuss and linux-kernel for the past few weeks. As Shuah said when kicking off the process, it's designed as a starting point for the next phase of the discussion, not as the end point, so it's only really a set of minor updates to further that goal. The merger of the three patches to show the combined effect is attached below. However, Greg recently posted the next phase of the discussion, so people will be asking what the merger of the series looks like. Ignoring the non-CoC documents, I think it looks like this --- diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst index eec768471a4d..8913851dab89 100644 --- a/Documentation/process/code-of-conduct.rst +++ b/Documentation/process/code-of-conduct.rst @@ -59,19 +59,27 @@ 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. -Reporting -========= +Enforcement +=========== Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the Technical Advisory Board (TAB) at -<tab@lists.linux-foundation.org>. 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 (except where -required by law). +reported by contacting the Code of Conduct Committee at +<conduct@kernel.org>. All complaints will be reviewed and investigated +and will result in a response that is deemed necessary and appropriate +to the circumstances. The Code of Conduct Committee is obligated to +maintain confidentiality with regard to the reporter of an incident +(except where required by law). Further details of specific enforcement +policies may be posted separately. + 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 + +Interpretation +============== + +See the :ref:`code_of_conduct_interpretation` document for how the Linux +kernel community will be interpreting this document. --- And I'm sure it can be rebased to this without disturbing the currently gathered tags. The patch can be pulled from git://git.kernel.org/pub/scm/linux/kernel/git/jejb/linux-coc.git coc-fixes With the diffstat: Documentation/process/code-of-conduct.rst | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) With full diff below. James --- diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst index ab7c24b5478c..eec768471a4d 100644 --- a/Documentation/process/code-of-conduct.rst +++ b/Documentation/process/code-of-conduct.rst @@ -31,7 +31,7 @@ Examples of unacceptable behavior by participants include: * 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 + address not ordinarily collected by the project, without explicit permission * Other conduct which could reasonably be considered inappropriate in a professional setting @@ -59,20 +59,16 @@ 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. -Enforcement -=========== +Reporting +========= Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Technical Advisory Board (TAB) at <tab@lists.linux-foundation.org>. 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. - -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. +confidentiality with regard to the reporter of an incident (except where +required by law). Attribution ===========
next reply other threads:[~2018-10-20 20:15 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-20 20:15 James Bottomley [this message] 2018-10-20 20:15 ` [GIT PULL] code of conduct fixes for 4.19-rc8 James Bottomley 2018-10-22 21:10 ` [Ksummit-discuss] " Greg Kroah-Hartman 2018-10-22 21:10 ` Greg Kroah-Hartman 2018-10-23 4:16 ` [Ksummit-discuss] " Joe Perches 2018-10-23 6:05 ` Randy Dunlap 2018-10-23 6:10 ` Joe Perches 2018-10-23 7:07 ` Josh Triplett 2018-10-23 7:07 ` Josh Triplett 2018-10-23 9:01 ` Mark Brown 2018-10-23 9:01 ` Mark Brown 2018-10-23 9:09 ` James Bottomley
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1540066514.3464.22.camel@HansenPartnership.com \ --to=james.bottomley@hansenpartnership.com \ --cc=akpm@linux-foundation.org \ --cc=greg@kroah.com \ --cc=ksummit-discuss@lists.linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=torvalds@linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.