From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
Linux Doc Mailing List <linux-doc@vger.kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 18/22] docs: trace: ring-buffer-design.txt: convert to ReST format
Date: Tue, 23 Jun 2020 10:24:54 +0200 [thread overview]
Message-ID: <20200623102454.4ca57b61@coco.lan> (raw)
In-Reply-To: <20200619164114.00379740@oasis.local.home>
Em Fri, 19 Jun 2020 16:41:14 -0400
Steven Rostedt <rostedt@goodmis.org> escreveu:
> On Fri, 19 Jun 2020 14:13:29 -0600
> Jonathan Corbet <corbet@lwn.net> wrote:
>
> > On Mon, 15 Jun 2020 08:50:23 +0200
> > Mauro Carvalho Chehab <mchehab+huawei@kernel.org> 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.
Until one week ago, this was not possible, because SPDX headers
were broken for GFDL:
https://github.com/spdx/license-list-XML/issues/686
https://github.com/spdx/license-list-XML/issues/970
There are 2 types of GFDL licenses:
- a Free license where the entire document allows
reviewing/changing;
- a non-free variant, were some parts of the document
have a non-free license, where only the author can
change (called invariant parts).
Basically, some distro policies don't allow shipping documents
under the non-free version of GFDL.
The SPDX spec (up to version 3.9) doesn't allow differentiating
between them.
-
There's now an upstream patch (at SPDX) to be merged on the upcoming
versin 3.10 that will allow us to finally get rid of those:
https://github.com/spdx/license-list-XML/pull/1048/commits/f695d2ac65230d0f4161ba58fff2f9d87bb5a053#diff-b948674e5c5cf6341e44e76b2565e80c
The GFDL-1.2 with no invariant sections is defined as:
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license licenseId="GFDL-1.2-only-no-invariants" isOsiApproved="false"
name="GNU Free Documentation License v1.2 only - no invariants">
<crossRefs>
<crossRef>https://www.gnu.org/licenses/old-licenses/fdl-1.2.txt</crossRef>
</crossRefs>
<standardLicenseHeader>
Copyright (c) <alt name="copyright" match=".+">YEAR YOUR NAME</alt>.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
Version 1.2; with no Invariant Sections, no Front-Cover Texts,
and no Back-Cover Texts. A copy of the license is included
in the section entitled "GNU Free Documentation License".
</standardLicenseHeader>
<notes>
This license was released November 2002. The identifier
GFDL-1.2-only-no-invariants should only be used when there are
no Invariant Sections, Front-Cover Texts or Back-Cover Texts.
See GFDL-1.2-only and GFDL-1.2-only-invariants for alternatives.
</notes>
>
> >
> > [...]
> >
> > > +.. 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+
Ah, right. I'll fix it.
>
> Copyright 2009 Red Hat Inc.
> - Author: Steven Rostedt <srostedt@redhat.com>
> - 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"
It should actually be:
"GPL-2.0 OR GFDL-1.2-only-no-invariants"
Thanks,
Mauro
next prev parent reply other threads:[~2020-06-23 8:25 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1592203650.git.mchehab+huawei@kernel.org>
2020-06-15 6:50 ` [PATCH 01/22] docs: dt: convert booting-without-of.txt to ReST format Mauro Carvalho Chehab
2020-06-19 20:00 ` Jonathan Corbet
2020-06-15 6:50 ` [PATCH 02/22] docs: thermal: convert cpu-idle-cooling.rst to ReST Mauro Carvalho Chehab
2020-06-19 20:02 ` Jonathan Corbet
2020-06-15 6:50 ` [PATCH 03/22] docs: crypto: convert asymmetric-keys.txt " Mauro Carvalho Chehab
2020-06-19 20:03 ` Jonathan Corbet
2020-06-15 6:50 ` [PATCH 04/22] docs: crypto: convert api-intro.txt to ReST format Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 05/22] docs: crypto: convert async-tx-api.txt " Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 06/22] docs: crypto: descore-readme.txt: convert " Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 07/22] docs: misc-devices/spear-pcie-gadget.txt: convert to ReST Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 08/22] docs: misc-devices/pci-endpoint-test.txt: " Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 09/22] " Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 10/22] docs: misc-devices/c2port.txt: convert to ReST format Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 11/22] docs: misc-devices/bh1770glc.txt: convert to ReST Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 12/22] docs: misc-devices/apds990x.txt: convert to ReST format Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 13/22] docs: pci: endpoint/function/binding/pci-test.txt convert to ReST Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 14/22] docs: arm64: convert perf.txt to ReST format Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 15/22] docs: powerpc: convert vcpudispatch_stats.txt to ReST Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 16/22] docs: sh: convert new-machine.txt " Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 17/22] docs: sh: convert register-banks.txt " Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 18/22] docs: trace: ring-buffer-design.txt: convert to ReST format Mauro Carvalho Chehab
2020-06-15 17:48 ` Joe Perches
2020-06-16 7:19 ` Mauro Carvalho Chehab
2020-06-19 20:13 ` Jonathan Corbet
2020-06-19 20:41 ` Steven Rostedt
2020-06-23 8:24 ` Mauro Carvalho Chehab [this message]
2020-06-15 6:50 ` [PATCH 19/22] docs: move other kAPI documents to core-api Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 20/22] docs: move remaining stuff under Documentation/*.txt to Documentation/staging Mauro Carvalho Chehab
2020-06-15 14:03 ` Masami Hiramatsu
2020-06-15 16:18 ` Mathieu Poirier
2020-06-15 6:50 ` [PATCH 21/22] docs: staging: don't use literalinclude Mauro Carvalho Chehab
2020-06-15 6:50 ` [PATCH 22/22] docs: staging: use small font for literal includes Mauro Carvalho Chehab
2020-06-19 20:18 ` Jonathan Corbet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200623102454.4ca57b61@coco.lan \
--to=mchehab+huawei@kernel.org \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).