Tags: sswen/linux-kernel2
Tags
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. Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
PreviousNext