From nobody Fri May 3 11:57:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617095360; cv=none; d=zohomail.com; s=zohoarc; b=CLFdNyw8g1wRzjiRrr4CvgCRzgcL87TL1jGO8F50UKU/khGejcisoeE0ORx1Oo67gqYG9tM5l7oAeZZeNjd9cuG/maJNs/FI+KnUZFWVeC5OLbwJFiwfcpY8onMYvTDmkwpuUZcJS3pjKc3lAQ8Snc85Ka5iaUR9sWG68mwlkh4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617095360; 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=J9updPIcNWkAEREa/hl6RSqM3olKdIK082QIkwvYo3s=; b=AV9ZdxNS9OWn39S1dRdVU80U4WZDUToJE1UpjCjMJgPZlSdYTsAaOCzIKlI9dowfAL76r6uW+tphvtFhF6vf3QMGA92xfb9ZD6352/PlJpUAnVQc+VYdiOShJAAruLG+uqnbzoyTxm1rm6IwW0YmHcHwa8t2PRi6VS+r6w46QoE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1617095360037778.1846663053392; Tue, 30 Mar 2021 02:09:20 -0700 (PDT) Received: from localhost ([::1]:33352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRANC-00011x-D5 for importer@patchew.org; Tue, 30 Mar 2021 05:09:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRAMP-0000ch-8i for qemu-devel@nongnu.org; Tue, 30 Mar 2021 05:08:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27330) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRAMJ-0005RJ-9D for qemu-devel@nongnu.org; Tue, 30 Mar 2021 05:08:28 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-311-pwAS8WsrMHq5BRG4Aylu-w-1; Tue, 30 Mar 2021 05:08:15 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5658A5B368; Tue, 30 Mar 2021 09:08:14 +0000 (UTC) Received: from thuth.com (ovpn-112-225.ams2.redhat.com [10.36.112.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id F34FB5E1A4; Tue, 30 Mar 2021 09:08:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617095300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J9updPIcNWkAEREa/hl6RSqM3olKdIK082QIkwvYo3s=; b=fdivZxLKfqOQAeOK8m4GdEfKS4RjoiIwasrSzGXAvE9suWVt+fWC2fibyIi3w8HQISlrpq vfgNEtfttFtkSg+B9nfRZ+ANsnIcu0cpVhW+aenxUfd5PIR0ZIEV5tiTGeNsiiiV8Xp6d+ Ccjd46O/Up4rIsY3dxvBXbJe1J4dfkQ= X-MC-Unique: pwAS8WsrMHq5BRG4Aylu-w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf , Peter Maydell Subject: [PATCH v2] docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document Date: Tue, 30 Mar 2021 11:08:06 +0200 Message-Id: <20210330090806.2802667-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 rarely happens in the QEMU community, but still there are such rare cases, and then it would be good to have a basic code of conduct document available that can be shown to persons who are misbehaving. And if 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 is based on the Django Code of Conduct (https://www.djangoproject.com/conduct/) and the conflict resolution has been assembled by Paolo, based on the Drupal Conflict Resolution Policy (https://www.drupal.org/conflict-resolution) and the Mozilla Consequence La= dder (https://github.com/mozilla/diversity/blob/master/code-of-conduct-enforceme= nt/consequence-ladder.md) Signed-off-by: Thomas Huth --- I've picked the Django Code of Conduct as a base, since it sounds rather friendly and still welcoming to me, but I'm open for other suggestions, too (but we should maybe pick one where the conflict resolution policy is separated from the CoC itself so that it can be better taylored to the requirements of the QEMU project) v2: Adjusted the wording in the conflict resolution document according to the suggestions from Daniel and Paolo docs/devel/code-of-conduct.rst | 85 ++++++++++++++++++++++++++++++ docs/devel/conflict-resolution.rst | 78 +++++++++++++++++++++++++++ docs/devel/index.rst | 2 + 3 files changed, 165 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..050dbd9e16 --- /dev/null +++ b/docs/devel/code-of-conduct.rst @@ -0,0 +1,85 @@ +Code of Conduct +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Like the technical community as a whole, the QEMU community is made up of a +mixture of professionals and volunteers from all over the world. +Diversity is one of our huge strengths, but it can also lead to communicat= ion +issues and unhappiness. To that end, we have a few ground rules that we ask +people to adhere to. This code applies equally to founders, maintainers, +contributors, mentors and those seeking help and guidance. + +This isn't an exhaustive list of things that you can't do. Rather, take it= in +the spirit in which it's intended - a guide to make it easier to enrich al= l of +us and the technical communities in which we participate: + +* Be friendly and patient. + +* Be welcoming. We strive to be a community that welcomes and supports peo= ple + of all backgrounds and identities. This includes, but is not limited to + members of any race, ethnicity, culture, national origin, colour, immigr= ation + status, social and economic class, educational level, sex, sexual orient= ation, + gender identity and expression, age, size, family status, political beli= ef, + religion, and mental and physical ability. + +* Be considerate. Your work will be used by other people, and you in turn = will + depend on the work of others. Any decision you take will affect users and + colleagues, and you should take those consequences into account when mak= ing + decisions. Remember that we're a world-wide community, so you might not = be + communicating in someone else's primary language. + +* Be respectful. Not all of us will agree all the time, but disagreement i= s no + excuse for poor behavior and poor manners. We might all experience some + frustration now and then, but we cannot allow that frustration to turn i= nto + a personal attack. It's important to remember that a community where peo= ple + feel uncomfortable or threatened is not a productive one. Members of the= QEMU + community should be respectful when dealing with other members as well as + with people outside the QEMU community. + +* Be careful in the words that you choose. We are a community of professio= nals, + and we conduct ourselves professionally. Be kind to others. Do not insul= t or + put down other participants. Harassment and other exclusionary behavior + aren't acceptable. This includes, but is not limited to: + + * Violent threats or language directed against another person. + + * Discriminatory jokes and language. + + * Posting sexually explicit or violent material. + + * Posting (or threatening to post) other people's personally identifying + information ("doxing"). + + * Personal insults, especially those using racist or sexist terms. + + * Unwelcome sexual attention. + + * Advocating for, or encouraging, any of the above behavior. + + * Repeated harassment of others. In general, if someone asks you to stop, + then stop. + +* When we disagree, try to understand why. Disagreements, both social and + technical, happen all the time and our project is no exception. It is + important that we resolve disagreements and differing views constructive= ly. + Remember that we're different. The strength of our project comes from its + varied community, people from a wide range of backgrounds. Different peo= ple + have different perspectives on issues. Being unable to understand why so= meone + holds a viewpoint doesn't mean that they're wrong. Don't forget that it = is + human to err and blaming each other doesn't get us anywhere. Instead, fo= cus + on helping to resolve issues and learning from mistakes. + +This code of conduct applies to all spaces managed by the QEMU project. Th= is +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. In addition, violations of this code outside these spaces m= ay +affect a person's ability to participate within them. + +If you believe someone is violating the code of conduct, please read the +:ref:`conflict-resolution` document for information about how to proceed. + +This document is based on the `Django Code of Conduct +`__, with original text courtesy o= f the +`Speak Up! project +`__ +(`CC BY 3.0 `__). + diff --git a/docs/devel/conflict-resolution.rst b/docs/devel/conflict-resol= ution.rst new file mode 100644 index 0000000000..3f2a1744fd --- /dev/null +++ b/docs/devel/conflict-resolution.rst @@ -0,0 +1,78 @@ +.. _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 permanent or temporary ban from some or all current and future QEMU + spaces (mailing lists, IRC, wiki, etc.). + +In the event of severe harassment, the leadership comittee may advise that +the matter be escalated to the relevant local law enforcement agency. It +is however not the role of the leadership comittee to initiate contact +with law enforcement on behalf of any of the community members involved +in an incident. + +Sources +------- + +* `Drupal Conflict Resolution Policy and Process `__ + +* `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.27.0