From nobody Sat May 4 21:33:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617203200; cv=none; d=zohomail.com; s=zohoarc; b=hEeGtohbudoNJFpCBGnbcBzvk4gT7lbk8pT9E0TRnzZ1ieKXxVVOVQ0HCHAjDODZwCk2mDC2JoRRRnHvfIPN6Mt/K+XJ1g5EY10x+fgsitGKiFfbVuggY41r4fDbzMe87xwlUwbvUGPfQsHvu/5OQN5v8o76k2DgP7wQXtPZJlk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617203200; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=kpLyYmB8Ifa7BAgV3/Kz5ipu0Q0/5i68lB6G2u9z6R8=; b=hNLlKY1EpuXA7xM7A2L9AqNqRlhY/bfDiE/Ijwf54BZfYFNeBFMYULxJvaaUlMQqSa9PcA+tHpQf2tUM0pFPRSgXsKgDBBnxgZb9IdktlBP9vpk8kUcr8iT5lvFEw2HRF6d5gasTG/0qvKqd89dLsiY2hYr/d9stp+PuWkpp9TA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617203200518462.7011520080413; Wed, 31 Mar 2021 08:06:40 -0700 (PDT) Received: from localhost ([::1]:44772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRcQZ-000504-8m for importer@patchew.org; Wed, 31 Mar 2021 11:06:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRcPV-00044q-99 for qemu-devel@nongnu.org; Wed, 31 Mar 2021 11:05:33 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:33367) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRcPT-0002lO-2J for qemu-devel@nongnu.org; Wed, 31 Mar 2021 11:05:33 -0400 Received: by mail-ej1-x630.google.com with SMTP id ap14so17430950ejc.0 for ; Wed, 31 Mar 2021 08:05:30 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id q25sm1820943edt.51.2021.03.31.08.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 08:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kpLyYmB8Ifa7BAgV3/Kz5ipu0Q0/5i68lB6G2u9z6R8=; b=GmfkEMaH75zrCMJW6ejYB2ak2l4PdGZCWRnyuo0BI7iIMQiTKcU5m/hkGC5ZCOzpmS 7k501370ohGGsgl9ZoHX11+YnXBMqGs23MKGRiuLoT55AwsqRtPrYxgbmSp4ouiLOOk0 JYygmmMRASLHi4gIAmoRDdflCWecUD/xRYqhqg2P6JseUStXgZyjAG3Ih4IppTR1rOWF dwpuUfPA/VPqK4nTy2VXI5c1TzEURRVhLn0hJi0YZ5hHfCxB5LXbF2rHHxXmMgIo3Cc5 9S2noQGX/Jo45CnpJOTZlX/nlRzR3DovmBBgPrdKAzRugGpT+KTQ+NFVFczpcB6jTFTy AVxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=kpLyYmB8Ifa7BAgV3/Kz5ipu0Q0/5i68lB6G2u9z6R8=; b=gqJNdOhhsQqpAmJfGy0/eV3iryMsM9Q9i6EQxkUVM01VlPtji2DlkUKaAzBGgVgTZx 0w6K9ZbY3ZxpAcoxDWMVasi+IM3m21BsfDMOM7EH8nC9mAaPBRrbNyHoqHbrJfCRD605 v9by4VvUoupZr4sO2CuNg9rvNzo0fp30gOFcZBAga8cjN7KtGAHK+ICUguTgkgyk7D3G 2eLdfjKWnu1fN4zbHnhkoRkJ3xcDwz4AHP776jn0Trk6Njn+PPgrp2Z8Z6lbDz4E41Ha 1NkTyPnzovT4T3C/xJRH4ZR9F0vzLHsV7lE6nx9hlPqBHxVC20fFDsmqUbAosZ+A8nxB Va9Q== X-Gm-Message-State: AOAM530MflmQwwnbNON0vD0atHgPJ0kiRUWP/okz07nA8qfZF27r2+Ib 63kPOEcY1x+aG8XsxBi6rYqxdEIO8Ac= X-Google-Smtp-Source: ABdhPJz5gAVhfHd147xrkqEugEPjxtCpMsfJVqPvTEpqZIktzZsjQa75puWMwcZoKsanlrmoacRbcg== X-Received: by 2002:a17:906:4a50:: with SMTP id a16mr4057679ejv.256.1617203128775; Wed, 31 Mar 2021 08:05:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document Date: Wed, 31 Mar 2021 17:05:27 +0200 Message-Id: <20210331150527.14857-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x630.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Thomas Huth , berrange@redhat.com, agraf@csgraf.de, stefanha@redhat.com, alex.bennee@linaro.org, afaerber@suse.de Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) In an ideal world, we would all get along together very well, always be polite and never end up in huge conflicts. And even if there are conflicts, we would always handle each other fair and respectfully. Unfortunately, this is not an ideal world and sometimes people forget how to interact with each other in a professional and respectful way. Fortunately, this seldom happens in the QEMU community, but for such rare cases it is preferrable to have a basic code of conduct document available to show to people who are misbehaving. In case that does not help yet, we should also have a conflict resolution policy ready that can be applied in the worst case. The Code of Conduct document tries to be short and to the point while trying to remain friendly and welcoming; it is based on the Fedora Code of Conduct[1] with extra detail added based on the Contributor Covenant 1.3.0[2]. Other proposals included the Contributor Covenant 1.3.0 itself or the Django Code of Conduct[3] (which is also a derivative of Fedora's) but, in any case, there was agreement on keeping the conflict resolution policy separate from the CoC itself. An important point is whether to apply the code of conduct to violations that occur outside public spaces. The text herein restricts that to individuals acting as a representative or a member of the project or its community. This is intermediate between the Contributor Covenant (which only mentions representatives of the community, for example using an official project e-mail address or posting via an official social media account), and the Django Code of Conduct, which says that violations of this code outside these spaces "may" be considered but does not limit this further. The conflict resolution policy is based on the Drupal Conflict Resolution Policy[4] and its derivative, the Mozilla Consequence Ladder[5]. [1] https://www.fedoraproject.com/code-of-conduct/ [2] https://www.contributor-covenant.org/version/1/3/0/code-of-conduct/ [3] https://www.djangoproject.com/conduct/ [4] https://www.drupal.org/conflict-resolution [5] https://github.com/mozilla/diversity/blob/master/code-of-conduct-enforc= ement/consequence-ladder.md Co-developed-by: Thomas Huth Signed-off-by: Paolo Bonzini Reviewed-by and wait anyway for others to chip in. Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- docs/devel/code-of-conduct.rst | 60 ++++++++++++++++++++++ docs/devel/conflict-resolution.rst | 80 ++++++++++++++++++++++++++++++ docs/devel/index.rst | 2 + 3 files changed, 142 insertions(+) create mode 100644 docs/devel/code-of-conduct.rst create mode 100644 docs/devel/conflict-resolution.rst diff --git a/docs/devel/code-of-conduct.rst b/docs/devel/code-of-conduct.rst new file mode 100644 index 0000000000..83e8855250 --- /dev/null +++ b/docs/devel/code-of-conduct.rst @@ -0,0 +1,60 @@ +Code of Conduct +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +The QEMU community is made up of a mixture of professionals and +volunteers from all over the world. Diversity is one of our strengths, +but it can also lead to communication issues and unhappiness. +To that end, we have a few ground rules that we ask people to adhere to. + +* Be welcoming. We are committed to making participation in this project + a harassment-free experience for everyone, regardless of level of + experience, gender, gender identity and expression, sexual orientation, + disability, personal appearance, body size, race, ethnicity, age, religi= on, + or nationality. + +* Be respectful. Not all of us will agree all the time. Disagreements, bo= th + social and technical, happen all the time and the QEMU community is no + exception. When we disagree, we try to understand why. It is important = that + we resolve disagreements and differing views constructively. Members of= the + QEMU community should be respectful when dealing with other contributors= as + well as with people outside the QEMU community and with users of QEMU. + +Harassment and other exclusionary behavior are not acceptable. A community +where people feel uncomfortable or threatened is neither welcoming nor +respectful. Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery + +* Personal attacks + +* Trolling or insulting/derogatory comments + +* Public or private harassment + +* Publishing other's private information, such as physical or electronic +addresses, without explicit permission + +This isn't an exhaustive list of things that you can't do. Rather, take +it in the spirit in which it's intended=E2=80=94a guide to make it easier = to +be excellent to each other. + +This code of conduct applies to all spaces managed by the QEMU project. +This includes IRC, the mailing lists, the issue tracker, community +events, and any other forums created by the project team which the +community uses for communication. This code of conduct also applies +outside these spaces, when an individual acts as a representative or a +member of the project or its community. + +By adopting this code of conduct, project maintainers commit themselves +to fairly and consistently applying these principles to every aspect of +managing this project. If you believe someone is violating the code of +conduct, please read the +:ref:`conflict-resolution` document for +information about how to proceed. + +Sources +------- + +This document is based on the `Fedora Code of Conduct +`__ and the +`Contributor Covenant version 1.3.0 +`__. diff --git a/docs/devel/conflict-resolution.rst b/docs/devel/conflict-resol= ution.rst new file mode 100644 index 0000000000..1e0bb41674 --- /dev/null +++ b/docs/devel/conflict-resolution.rst @@ -0,0 +1,80 @@ +.. _conflict-resolution: + +Conflict Resolution Policy +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D + +Conflicts in the community can take many forms, from someone having a +bad day and using harsh and hurtful language on the mailing list to more +serious code of conduct violations (including sexist/racist statements +or threats of violence), and everything in between. + +For the vast majority of issues, we aim to empower individuals to first +resolve conflicts themselves, asking for help when needed, and only +after that fails to escalate further. This approach gives people more +control over the outcome of their dispute. + +How we resolve conflicts +------------------------ + +If you are experiencing conflict, please consider first addressing the +perceived conflict directly with other involved parties, preferably through +a real-time medium such as IRC. You could also try to get a third-party (e= .g. +a mutual friend, and/or someone with background on the issue, but not +involved in the conflict) to intercede or mediate. + +If this fails or if you do not feel comfortable proceeding this way, or +if the problem requires immediate escalation, report the issue to the QEMU +leadership committee by sending an email to qemu@sfconservancy.org, provid= ing +references to the misconduct. +For very urgent topics, you can also inform one or more members through IR= C. +The up-to-date list of members is `available on the QEMU wiki +`__. + +Your report will be treated confidentially by the leadership committee and +not be published without your agreement. The QEMU leadership committee will +then do its best to review the incident timely, and will either seek furth= er +information, or will make a determination on next steps. + +Remedies +-------- + +Escalating an issue to the QEMU leadership committee may result in actions +impacting one or more involved parties. In the event the leadership +committee has to intervene, here are some of the ways they might respond: + +1. Take no action. For example, if the leadership committee determines + the complaint has not been substantiated or is being made in bad faith, + or if it is deemed to be outside its purview. + +2. A private reprimand, explaining the consequences of continued behavior, + to one or more involved individuals. + +3. A private reprimand and request for a private or public apology + +4. A public reprimand and request for a public apology + +5. A public reprimand plus a mandatory cooling off period. The cooling + off period may require, for example, one or more of the following: + abstaining from maintainer duties; not interacting with people involved, + including unsolicited interaction with those enforcing the guidelines + and interaction on social media; being denied participation to in-person + events. The cooling off period is voluntary but may escalate to a + temporary ban in order to enforce it. + +6. A temporary or permanent ban from some or all current and future QEMU + spaces (mailing lists, IRC, wiki, etc.), possibly including in-person + events. + +In the event of severe harassment, the leadership committee may advise that +the matter be escalated to the relevant local law enforcement agency. It +is however not the role of the leadership committee to initiate contact +with law enforcement on behalf of any of the community members involved +in an incident. + +Sources +------- + +This document was developed based on the `Drupal Conflict Resolution +Policy and Process `__ +and the `Mozilla Consequence Ladder +`__ diff --git a/docs/devel/index.rst b/docs/devel/index.rst index 7c424ea6d7..416261505f 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -14,6 +14,8 @@ Contents: :maxdepth: 2 :includehidden: =20 + code-of-conduct + conflict-resolution build-system style kconfig --=20 2.30.1