From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 358A7C433B4 for ; Wed, 31 Mar 2021 17:05:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7638460FF1 for ; Wed, 31 Mar 2021 17:05:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7638460FF1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=dme.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lReHp-0001GL-7J for qemu-devel@archiver.kernel.org; Wed, 31 Mar 2021 13:05:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lReEG-0000HH-To for qemu-devel@nongnu.org; Wed, 31 Mar 2021 13:02:07 -0400 Received: from forward2-smtp.messagingengine.com ([66.111.4.226]:52679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lReED-0002PF-Q0 for qemu-devel@nongnu.org; Wed, 31 Mar 2021 13:02:04 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.nyi.internal (Postfix) with ESMTP id 3D6881942041; Wed, 31 Mar 2021 13:02:00 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 31 Mar 2021 13:02:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=1ArsmZeXiRz9T5nRNzCO0hAnUbvxgw+FzH21K1K4F so=; b=LzgRkT7zBkZ8iMWJZ8eWENOPD+Fb5RFzJaqiy+oHdJIQ8GMF2jOYXu1nV BdnmEJSZVNStFILblQs8Hq4c36dsID0qRylNdlteCRwYEM/LAqMIWh9RfdCSK5rG npNCo1V5CytAn7CHrY8RapBwIumoJVPiyXOjMoDwn9IoQsnnKFxtppYd3pFz9LZD CEIEA2ZYeokwgT/wGdnCng7DSRRSfq4L3HYvGMA3LJd39ZoKQa0qFoeZIkNVKeyf 3Am4nOn7MPfHBZLBcFQ5yEmjMUtkzgWBEWP970D1oqaC2nAd4YOJjmIUVgNLsZKd 6dL8p4sWHF2akGtNJBtMG7xDGqq7g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudeivddgudduudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefvufgjfhfhfffkgggtgfesthhqredttddtjeenucfhrhhomhepffgrvhhi ugcugfgumhhonhgushhonhcuoegumhgvsegumhgvrdhorhhgqeenucggtffrrghtthgvrh hnpeevheejkeduteeiieduhfeilefhteduvefhgefhfeekueeiheeggfeihefguefgieen ucffohhmrghinhepfhgvughorhgrphhrohhjvggtthdrtghomhdptghonhhtrhhisghuth horhdqtghovhgvnhgrnhhtrdhorhhgpdgujhgrnhhgohhprhhojhgvtghtrdgtohhmpdgu rhhuphgrlhdrohhrghdpghhithhhuhgsrdgtohhmpdhfvgguohhrrghprhhojhgvtghtrd horhhgpdhqvghmuhdrohhrghenucfkphepkedurddukeejrddviedrvdefkeenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegumhgvsegumhgvrd horhhg X-ME-Proxy: Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net [81.187.26.238]) by mail.messagingengine.com (Postfix) with ESMTPA id CF757240057; Wed, 31 Mar 2021 13:01:57 -0400 (EDT) Received: from localhost (disaster-area.hh.sledj.net [local]) by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 335df1c0; Wed, 31 Mar 2021 17:01:55 +0000 (UTC) To: Paolo Bonzini , qemu-devel@nongnu.org Subject: Re: [PATCH] docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document In-Reply-To: <20210331150527.14857-1-pbonzini@redhat.com> References: <20210331150527.14857-1-pbonzini@redhat.com> X-HGTTG: zarquon From: David Edmondson Date: Wed, 31 Mar 2021 18:01:55 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: neutral client-ip=66.111.4.226; envelope-from=dme@dme.org; helo=forward2-smtp.messagingengine.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NEUTRAL=0.779, T_FILL_THIS_FORM_SHORT=0.01, UNPARSEABLE_RELAY=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: 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wednesday, 2021-03-31 at 17:05:27 +02, Paolo Bonzini wrote: > 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 conflict= s, > we would always handle each other fair and respectfully. Unfortunately, > this is not an ideal world and sometimes people forget how to interact wi= th > 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-enfo= rcement/consequence-ladder.md > > Co-developed-by: Thomas Huth > Signed-off-by: Paolo Bonzini > --- > 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, reli= gion, > + or nationality. > + > +* Be respectful. Not all of us will agree all the time. Disagreements, = both > + social and technical, happen all the time and the QEMU community is no > + exception. When we disagree, we try to understand why. It is importan= t that > + we resolve disagreements and differing views constructively. Members = of the > + QEMU community should be respectful when dealing with other contributo= rs as > + well as with people outside the QEMU community and with users of QEMU. > + > +Harassment and other exclusionary behavior are not acceptable. A communi= ty > +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 easie= r 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-res= olution.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 thro= ugh > +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 QE= MU > +leadership committee by sending an email to qemu@sfconservancy.org, prov= iding > +references to the misconduct. > +For very urgent topics, you can also inform one or more members through = IRC. > +The up-to-date list of members is `available on the QEMU wiki > +`__. > + > +Your report will be treated confidentially by the leadership committee a= nd > +not be published without your agreement. The QEMU leadership committee w= ill > +then do its best to review the incident timely, and will either seek fur= ther s/timely/in a timely manner/ ? > +information, or will make a determination on next steps. > + > +Remedies > +-------- > + > +Escalating an issue to the QEMU leadership committee may result in actio= ns > +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 fait= h, > + or if it is deemed to be outside its purview. > + > +2. A private reprimand, explaining the consequences of continued behavio= r, > + 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 involv= ed, > + including unsolicited interaction with those enforcing the guidelines > + and interaction on social media; being denied participation to in-per= son > + 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 t= hat > +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=20 > + code-of-conduct > + conflict-resolution > build-system > style > kconfig > --=20 > 2.30.1 dme. --=20 I got a girlfriend that's better than that.