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=-15.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS 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 D5658C433ED for ; Wed, 31 Mar 2021 16:14:17 +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 6557061005 for ; Wed, 31 Mar 2021 16:14:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6557061005 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRdU0-0002ci-FW for qemu-devel@archiver.kernel.org; Wed, 31 Mar 2021 12:14:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRdRg-0008Jl-Qu for qemu-devel@nongnu.org; Wed, 31 Mar 2021 12:11:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57353) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRdRc-0007kz-RN for qemu-devel@nongnu.org; Wed, 31 Mar 2021 12:11:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617207105; 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: in-reply-to:in-reply-to:references:references; bh=YEKYqNlHdTUn9fBm6Wc6HWdTkFlfwyzHB72RK7x6fEg=; b=iTLAbUS1CHz6aZ7d/N2CewYUsRfwB7sSRfwkoU6HzQmFR8K00X3m3sdgZ/mCmOZStkSJL0 iojwQxZ1vv5hsHKUV2JvoggKeCYtal1CvaIb3AVr9vwv70jBSRmpnu71VarPo+x+kqbgFg MPfzuEuQXHKpaUSQmP6JgvpZSSFpvxk= Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-330-_Hnvlj7lO1KJ-6Bc7MBsCQ-1; Wed, 31 Mar 2021 12:11:40 -0400 X-MC-Unique: _Hnvlj7lO1KJ-6Bc7MBsCQ-1 Received: by mail-pg1-f200.google.com with SMTP id u12so1699308pgr.3 for ; Wed, 31 Mar 2021 09:11:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YEKYqNlHdTUn9fBm6Wc6HWdTkFlfwyzHB72RK7x6fEg=; b=OHOpXYUEnU6Nn0gHcyACz0EGIHu5Fhj9rihEzXy8VfH3s0ym36s/j4YKqzIyZdbWY4 c0C2JVsSb7QbopMo3X5s6BlMTFyzBueSu7nHaGMqZ/Mg5nvuDlbX82hhUsKjHz9ZU8Te 9+2JAYx82uiO/Yt2xZS4dsxfUl7Dg/ORSwsfK7+gQEBC4v2npHuqRdNT5UaRznY7Ap6k dWcSeON1dUESTqHp4V5CYesxSVCGkX4JVW/k0NRTSSep/4ZgNDOz3qeJw8W3UsDM8GpM bKzWcPZQ1jymbQm8F/6bCg06OLAMXDt+P4XHpLDDqJTPJ9o8a3iA4QUXMqTS6vbSL0uN isRQ== X-Gm-Message-State: AOAM531eonVFitxjAqJqJI7UjziT+q5IgAGIV9uSJn70iIKhLDPT6HiA /j5XoUmMrZq/XemBp+QixcoytzOOoH/zATQjrUdFa9SNqPojAdCuzQ5Nmq4zEkNzlh4R+AkMVsa hneVUDTKVpl8HwEMRO1E7o71Brdyx+fU= X-Received: by 2002:a17:902:e74f:b029:e5:fedb:92b9 with SMTP id p15-20020a170902e74fb02900e5fedb92b9mr3654425plf.67.1617207099765; Wed, 31 Mar 2021 09:11:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIRHG2gJfV+fRmCrcQDiZvnOhVRjOoIYBhdtd/JiFsIDd7kF/ui+XJ4dz7SvxL1pxsezV5IxpyLf5WoJqyY6Q= X-Received: by 2002:a17:902:e74f:b029:e5:fedb:92b9 with SMTP id p15-20020a170902e74fb02900e5fedb92b9mr3654406plf.67.1617207099458; Wed, 31 Mar 2021 09:11:39 -0700 (PDT) MIME-Version: 1.0 References: <20210331150527.14857-1-pbonzini@redhat.com> <72bc8020-2028-82db-219c-a6ae311e26df@redhat.com> In-Reply-To: <72bc8020-2028-82db-219c-a6ae311e26df@redhat.com> From: Paolo Bonzini Date: Wed, 31 Mar 2021 18:11:26 +0200 Message-ID: Subject: Re: [PATCH] docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document To: Thomas Huth Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="000000000000b11d8d05bed75e89" Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@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, HTML_MESSAGE=0.001, 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: "Maydell, Peter" , "P. Berrange, Daniel" , qemu-devel , "Graf, Alexander" , "Hajnoczi, Stefan" , =?UTF-8?B?QWxleCBCZW5uw6ll?= , afaerber Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000b11d8d05bed75e89 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Il mer 31 mar 2021, 17:48 Thomas Huth ha scritto: > > +This isn't an exhaustive list of things that you can't do. Rather, tak= e > > +it in the spirit in which it's intended=E2=80=94a guide to make it eas= ier to > > s/intended=E2=80=94a/intended =E2=80=94 a/ > It looks ugly in monospace but it's the way em dashes are typically formatted. The appropriate spacing is usually included in the font. But a colon is even better than an em dash here. :) I'll keep your Reviewed-by and wait anyway for others to chip in. Paolo > With that fixed: > > Reviewed-by: Thomas Huth > > Thanks for putting this together! > > > > +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 themselve= s > > +to fairly and consistently applying these principles to every aspect o= f > > +managing this project. If you believe someone is violating the code o= f > > +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-resolution.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 mo= re > > +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 firs= t > > +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-part= y > (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, o= r > > +if the problem requires immediate escalation, report the issue to the > QEMU > > +leadership committee by sending an email to qemu@sfconservancy.org, > providing > > +references to the misconduct. > > +For very urgent topics, you can also inform one or more members throug= h > IRC. > > +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 > further > > +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 guidelin= es > > + 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 QE= MU > > + spaces (mailing lists, IRC, wiki, etc.), possibly including in-pers= on > > + 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 contac= t > > +with law enforcement on behalf of any of the community members involve= d > > +in an incident. > > + > > +Sources > > +------- > > + > > +This document was developed based on the `Drupal Conflict Resolution > > +Policy and Process `__ > > +and the `Mozilla Consequence Ladder > > +< > https://github.com/mozilla/diversity/blob/master/code-of-conduct-enforcem= ent/consequence-ladder.md > >`__ > > 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: > > > > + code-of-conduct > > + conflict-resolution > > build-system > > style > > kconfig > > > > --000000000000b11d8d05bed75e89 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


Il mer 31 mar 2021, 17:48 Thomas Huth <thuth@redhat.c= om> ha scritto:
> +This isn't an exhaustive list of things that you can't do. Ra= ther, take
> +it in the spirit in which it's intended=E2=80=94a guide to make i= t easier to

s/intended=E2=80=94a/intended =E2=80=94 a/

It looks ugly in monospace but it= 's the way em dashes are typically formatted. The appropriate spacing i= s usually included in the font.

But a colon is even better than an em dash here. :) I'll keep= your Reviewed-by and wait anyway for others to chip in.

Paolo


With that fixed:

Reviewed-by: Thomas Huth <thuth@redhat.com>

Thanks for putting this together!


> +be excellent to each other.
> +
> +This code of conduct applies to all spaces managed by the QEMU projec= t.
> +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 themselv= es
> +to fairly and consistently applying these principles to every aspect = of
> +managing this project.=C2=A0 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
> +<https://fedoraproject.org/c= ode-of-conduct>`__ and the
> +`Contributor Covenant version 1.3.0
> +<h= ttps://www.contributor-covenant.org/version/1/3/0/code-of-conduct/>`= __.
> diff --git a/docs/devel/conflict-resolution.rst b/docs/devel/conflict-= resolution.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 m= ore
> +serious code of conduct violations (including sexist/racist statement= s
> +or threats of violence), and everything in between.
> +
> +For the vast majority of issues, we aim to empower individuals to fir= st
> +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 th= e
> +perceived conflict directly with other involved parties, preferably t= hrough
> +a real-time medium such as IRC. You could also try to get a third-par= ty (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@sfcon= servancy.org, providing
> +references to the misconduct.
> +For very urgent topics, you can also inform one or more members throu= gh IRC.
> +The up-to-date list of members is `available on the QEMU wiki
> +<https://wiki.qemu.org/Conservancy>`__.
> +
> +Your report will be treated confidentially by the leadership committe= e and
> +not be published without your agreement. The QEMU leadership committe= e will
> +then do its best to review the incident timely, and will either seek = further
> +information, or will make a determination on next steps.
> +
> +Remedies
> +--------
> +
> +Escalating an issue to the QEMU leadership committee may result in ac= tions
> +impacting one or more involved parties. In the event the leadership > +committee has to intervene, here are some of the ways they might resp= ond:
> +
> +1. Take no action. For example, if the leadership committee determine= s
> +=C2=A0 =C2=A0the complaint has not been substantiated or is being mad= e in bad faith,
> +=C2=A0 =C2=A0or if it is deemed to be outside its purview.
> +
> +2. A private reprimand, explaining the consequences of continued beha= vior,
> +=C2=A0 =C2=A0to 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 coolin= g
> +=C2=A0 =C2=A0off period may require, for example, one or more of the = following:
> +=C2=A0 =C2=A0abstaining from maintainer duties; not interacting with = people involved,
> +=C2=A0 =C2=A0including unsolicited interaction with those enforcing t= he guidelines
> +=C2=A0 =C2=A0and interaction on social media; being denied participat= ion to in-person
> +=C2=A0 =C2=A0events.=C2=A0 The cooling off period is voluntary but ma= y escalate to a
> +=C2=A0 =C2=A0temporary ban in order to enforce it.
> +
> +6. A temporary or permanent ban from some or all current and future Q= EMU
> +=C2=A0 =C2=A0spaces (mailing lists, IRC, wiki, etc.), possibly includ= ing in-person
> +=C2=A0 =C2=A0events.
> +
> +In the event of severe harassment, the leadership committee may advis= e that
> +the matter be escalated to the relevant local law enforcement agency.= It
> +is however not the role of the leadership committee to initiate conta= ct
> +with law enforcement on behalf of any of the community members involv= ed
> +in an incident.
> +
> +Sources
> +-------
> +
> +This document was developed based on the `Drupal Conflict Resolution<= br> > +Policy and Process <https:/= /www.drupal.org/conflict-resolution>`__
> +and the `Mozilla Consequence Ladder
> +<https://github.com/mozilla/diversity/blob/mas= ter/code-of-conduct-enforcement/consequence-ladder.md>`__
> 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:
>=C2=A0 =C2=A0 =C2=A0 :maxdepth: 2
>=C2=A0 =C2=A0 =C2=A0 :includehidden:
>=C2=A0 =C2=A0
> +=C2=A0 =C2=A0code-of-conduct
> +=C2=A0 =C2=A0conflict-resolution
>=C2=A0 =C2=A0 =C2=A0 build-system
>=C2=A0 =C2=A0 =C2=A0 style
>=C2=A0 =C2=A0 =C2=A0 kconfig
>

--000000000000b11d8d05bed75e89--