Received: by 2002:ac0:aa62:0:0:0:0:0 with SMTP id w31-v6csp260200ima; Sat, 20 Oct 2018 06:52:40 -0700 (PDT) X-Google-Smtp-Source: ACcGV62NlK8K7PhudNDrn4MZz043iSB8SQzk3kKO5l79DqEirSNZzFKnpNXqIsooqnjdkJDiH8jm X-Received: by 2002:a17:902:2f41:: with SMTP id s59-v6mr28591979plb.277.1540043560154; Sat, 20 Oct 2018 06:52:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540043560; cv=none; d=google.com; s=arc-20160816; b=F1LNc4By+q6UPGg4FDvVweaDiZKNpWwSNn5/95UKbnJP5xlQnCMLiCR6SD7MSEBAMg SZGBScGrzy5pXMFDXLSQR/JwwDBa6/ADoTHwWOb65H4+F8LvMgCuDUDcVVGjUu9KkgQl 7GjE0Eplzb0ESeRsAV2Oh/cWnkqryrIju7VX/KiGI6wDVngzwEpDFvvXmcUcYgo6YHaE KIsgSno6DIbKmw8nbgTfInhXqU7Moh4PfDWQC3EGKOAtMlaP8qvbUwPga8DVt9jcvhj2 4uCi2HKhn//9wqxSXwQqBWPvYgui0psVShG8vgDLgBSO9SieW9hdToY5v+1xOZDOkthC rcuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=dZv42KCxr3oAvVeJ3R2/9YszCN1o23ZxVm8ixDuwk2c=; b=uUfn+S94vZyepr7EEAQ1JDdxvwZ1dzgLvrnv/jDXhW7OzxzeBCc5xO4vRgThD5abt/ uXPkxJZ07O6+qy6IrYWFMfbt5eqz59mCqWiR6cJCwEtyu7idpzL4LKQswOXgwq+dF9o1 uffRCsZH0Twj9bKqvHbi+FsNL/mA2CT6jCgDkBSTq2t6VMs5VmAD2qmgD22YQgKb7sni TuO0KpTZTb6ww0oHwDneqbIf/jNtxA4Ams9DSBAb0MF3ZXgUO+mNH16dRh/c87gPOsJO 5/EUfli4SZXavd+PorWcmIT6MSrOlHXZRScePfDmSkKw6oEoRC+AdcSufCq7jJTuC/iJ Rufw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HYsY8kB7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 33-v6si16267981plv.207.2018.10.20.06.52.25; Sat, 20 Oct 2018 06:52:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HYsY8kB7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727738AbeJTWCh (ORCPT + 99 others); Sat, 20 Oct 2018 18:02:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:59892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727364AbeJTWCg (ORCPT ); Sat, 20 Oct 2018 18:02:36 -0400 Received: from localhost (10.193.71.37.rev.sfr.net [37.71.193.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C3AC42152F; Sat, 20 Oct 2018 13:52:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540043523; bh=G5dvQ5ToyfK+0a6scxCB3REUxkxrOwh/U7I3XktBiC4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=HYsY8kB7bttqTYDCmUFqWSYDh/FJ93eVGmP8dS2/OKhFNi1WFDW6RHjOF7M2AGoYw BSBb0fUXPztw1gn90etRGA3qX36tpVc6fSefPBq+VDnRsgJhGGOL/+NtkzSyRu8roF 0hTkZGzlwjMFAysbBJ4PcxnPQaNFilOSj09/yDl0= Date: Sat, 20 Oct 2018 15:50:43 +0200 From: Greg Kroah-Hartman To: linux-kernel Cc: ksummit-discuss@lists.linuxfoundation.org, Thomas Gleixner , Olof Johansson , Chris Mason , Mishi Choudhary Subject: [PATCH 4/7] Code of Conduct: Provide links between the two documents Message-ID: <20181020135043.GE32218@kroah.com> References: <20181020134908.GA32218@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181020134908.GA32218@kroah.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Create a link between the Code of Conduct and the Code of Conduct Interpretation so that people can see that they are related. Acked-by: Chris Mason Acked-by: Olof Johansson Acked-by: Theodore Ts'o Acked-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman --- Documentation/process/code-of-conduct-interpretation.rst | 4 +++- Documentation/process/code-of-conduct.rst | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Documentation/process/code-of-conduct-interpretation.rst b/Documentation/process/code-of-conduct-interpretation.rst index ecf84cd29735..4d4e2cc94b5e 100644 --- a/Documentation/process/code-of-conduct-interpretation.rst +++ b/Documentation/process/code-of-conduct-interpretation.rst @@ -1,7 +1,9 @@ +.. _code_of_conduct_interpretation: + Linux Kernel Contributor Covenant Code of Conduct Interpretation ================================================================ -The Contributor Covenant Code of Conduct is a general document meant to +The :ref:`code_of_conduct` is a general document meant to provide a set of rules for almost any open source community. Every open-source community is unique and the Linux kernel is no exception. Because of this, this document describes how we in the Linux kernel diff --git a/Documentation/process/code-of-conduct.rst b/Documentation/process/code-of-conduct.rst index a2641c19cf26..3046664c929e 100644 --- a/Documentation/process/code-of-conduct.rst +++ b/Documentation/process/code-of-conduct.rst @@ -1,3 +1,5 @@ +.. _code_of_conduct: + Contributor Covenant Code of Conduct ++++++++++++++++++++++++++++++++++++ @@ -75,3 +77,9 @@ Attribution This Code of Conduct is adapted from the Contributor Covenant, version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +Interpretation +============== + +See the :ref:`code_of_conduct_interpretation` document for how the Linux +kernel community will be interpreting this document. -- 2.19.1