From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id E62426B07 for ; Sun, 7 Oct 2018 22:25:49 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 933457E9 for ; Sun, 7 Oct 2018 22:25:48 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id c56-v6so19156532qtd.11 for ; Sun, 07 Oct 2018 15:25:48 -0700 (PDT) MIME-Version: 1.0 References: <1538861738.4088.5.camel@HansenPartnership.com> <1538861799.4088.6.camel@HansenPartnership.com> In-Reply-To: <1538861799.4088.6.camel@HansenPartnership.com> From: Dave Airlie Date: Mon, 8 Oct 2018 08:25:35 +1000 Message-ID: To: James Bottomley Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Cc: LKML , ksummit Subject: Re: [Ksummit-discuss] [PATCH 1/2] code-of-conduct: Fix the ambiguity about collecting email addresses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Sun, 7 Oct 2018 at 07:36, James Bottomley wrote: > > From 4a614e9440148894207bef5bf69e74071baceb3b Mon Sep 17 00:00:00 2001 > From: James Bottomley > Date: Sat, 6 Oct 2018 14:21:56 -0700 > Subject: [PATCH 1/2] code-of-conduct: Fix the ambiguity about collecting = email > addresses > > The current code of conduct has an ambiguity in the it considers publishi= ng > private information such as email addresses unacceptable behaviour. Sinc= e > the Linux kernel collects and publishes email addresses as part of the pa= tch > process, add an exception clause for email addresses ordinarily collected= by > the project to correct this ambiguity. > > Signed-off-by: James Bottomley > --- > Documentation/process/code-of-conduct.rst | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/pr= ocess/code-of-conduct.rst > index ab7c24b5478c..aa40e34e7785 100644 > --- a/Documentation/process/code-of-conduct.rst > +++ b/Documentation/process/code-of-conduct.rst > @@ -31,7 +31,7 @@ Examples of unacceptable behavior by participants inclu= de: > * Trolling, insulting/derogatory comments, and personal or political att= acks > * Public or private harassment > * Publishing others=E2=80=99 private information, such as a physical or = electronic > - address, without explicit permission > + address not ordinarily collected by the project, without explicit perm= ission > * Other conduct which could reasonably be considered inappropriate in a > professional setting > I agree we want something like this, the question is whether we want to change the CoC text from upstream, or clarify it in a separate section. This isn't a legally binding license or anything, but departing from the upstream wording makes it tricker to merge new upstream versions if they are considered appropriate. Dave.