Re: [PATCH] docs: trace: ring-buffer-design.rst: use the new SPDX tag
From: Jonathan Corbet <corbet@lwn.net>
Date: 2020-08-26 12:47:40
Also in:
lkml
On Wed, 26 Aug 2020 09:28:24 +0200 Mauro Carvalho Chehab [off-list ref] wrote:
SPDX v3.10 gained support for GFDL-1.2 with no invariant sections: https://spdx.org/licenses/GFDL-1.2-invariants-only.html Let's use it, instead of keeping a license text for this file. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- Documentation/trace/ring-buffer-design.rst | 26 +--------------------- 1 file changed, 1 insertion(+), 25 deletions(-)
[CC expanded] If we're going to do this, I think we should also add GFDL to the right place in the LICENSES directory - deprecated/ or at best dual/. But even SPDX (https://spdx.org/licenses/GFDL-1.2.html) says this license is deprecated. Beyond that, https://spdx.org/licenses/GFDL-1.2-invariants-only.html seems to disagree with your interpretation; it seems you would want GFDL-1.2-only-no-invariants ? jon
quoted hunk ↗ jump to hunk
diff --git a/Documentation/trace/ring-buffer-design.rst b/Documentation/trace/ring-buffer-design.rst index 9c8d22a53d6c..a76435610b58 100644 --- a/Documentation/trace/ring-buffer-design.rst +++ b/Documentation/trace/ring-buffer-design.rst@@ -1,28 +1,4 @@ -.. 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 -.. 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.2 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 included at -.. Documentation/userspace-api/media/fdl-appendix.rst. -.. -.. TODO: replace it to GPL-2.0 OR GFDL-1.2 WITH no-invariant-sections +.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.2-invariants-only =========================== Lockless Ring Buffer Design