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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=no 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 33570C433DF for ; Fri, 19 Jun 2020 20:41:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1CA122100A for ; Fri, 19 Jun 2020 20:41:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390838AbgFSUlS (ORCPT ); Fri, 19 Jun 2020 16:41:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:58632 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390600AbgFSUlR (ORCPT ); Fri, 19 Jun 2020 16:41:17 -0400 Received: from oasis.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (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 855192100A; Fri, 19 Jun 2020 20:41:16 +0000 (UTC) Date: Fri, 19 Jun 2020 16:41:14 -0400 From: Steven Rostedt To: Jonathan Corbet Cc: Mauro Carvalho Chehab , Linux Doc Mailing List , linux-kernel@vger.kernel.org Subject: Re: [PATCH 18/22] docs: trace: ring-buffer-design.txt: convert to ReST format Message-ID: <20200619164114.00379740@oasis.local.home> In-Reply-To: <20200619141329.3867e57e@lwn.net> References: <20200619141329.3867e57e@lwn.net> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 19 Jun 2020 14:13:29 -0600 Jonathan Corbet wrote: > On Mon, 15 Jun 2020 08:50:23 +0200 > Mauro Carvalho Chehab wrote: > > [CC += Steve] Thanks. > > > - Just like some media documents, this file is dual licensed > > with GPL and GFDL. As right now the GFDL SPDX definition is > > bogus (as it doesn't tell anything about invariant parts), > > let's not use SPDX here. Let's use, instead, the same test > > as we have on media. > > The dual-licensing really can't be expressed with an SPDX tag? Because... A SPDX dual license should be possible, as it's used for GPL and BSD in several locations. > > [...] > > > +.. This file is dual-licensed: you can use it either under the terms > > +.. of the GPL 2.0 or the GFDL 1.2+ license, at your option. Note that this And I never said GFDL 1.2+ Copyright 2009 Red Hat Inc. - Author: Steven Rostedt - License: The GNU Free Documentation License, Version 1.2 - (dual licensed under the GPL v2) -Reviewers: Mathieu Desnoyers, Huang Ying, Hidetoshi Seto, There is no "+" sign here. > > +.. dual licensing only applies to this file, and not this project as a > > +.. whole. > > +.. > > +.. a) This file is free software; you can redistribute it and/or > > +.. modify it under the terms of the GNU General Public License as > > +.. published by the Free Software Foundation version 2 of > > +.. the License. > > +.. > > +.. This file is distributed in the hope that it will be useful, > > +.. but WITHOUT ANY WARRANTY; without even the implied warranty of > > +.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > +.. GNU General Public License for more details. > > +.. > > +.. Or, alternatively, > > +.. > > +.. b) Permission is granted to copy, distribute and/or modify this > > +.. document under the terms of the GNU Free Documentation License, > > +.. Version 1.1 or any later version published by the Free Software > > +.. Foundation, with no Invariant Sections, no Front-Cover Texts > > +.. and no Back-Cover Texts. A copy of the license is available at > > +.. https://www.gnu.org/licenses/old-licenses/fdl-1.2.html > > +.. > > +.. TODO: replace it to GPL-2.0 OR GFDL-1.2-or-later WITH no-invariant-sections "GPL-2.0 OR GFDL-1.2" -- Steve > > ...adding all that boilerplate is kind of a bummer. > > At a minimum I'd want an ack from Steve (who wasn't copied) before > applying this, but it would be better to add a bit more SPDX > infrastructure to express this if possible. > > Thanks, > > jon