From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kate Stewart <kstewart@linuxfoundation.org>,
Jonathan Corbet <corbet@lwn.net>,
Alexey Kardashevskiy <aik@ozlabs.ru>,
Alex Williamson <alex.williamson@redhat.com>,
Michael Ellerman <mpe@ellerman.id.au>,
kvm@vger.kernel.org
Subject: [patch 9/9] vfio/pci: Cleanup license mess
Date: Fri, 18 Jan 2019 00:14:25 +0100 [thread overview]
Message-ID: <20190117231501.654003681@linutronix.de> (raw)
In-Reply-To: 20190117231416.111952141@linutronix.de
The recently added nvlink2 VFIO driver introduced a license conflict in two
files. In both cases the SPDX license identifier is:
SPDX-License-Identifier: GPL-2.0+
but the files contain also the following license boiler plate text:
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation
The latter is GPL-2.9-only and not GPL-2.0=.
Looking deeper. The nvlink source file is derived from vfio_pci_igd.c which
is also licensed under GPL-2.0-only and it can be assumed that the file was
copied and modified. As the original file is licensed GPL-2.0-only it's not
possible to relicense derivative work to GPL-2.0-or-later.
Fix the SPDX identifier and remove the boiler plate as it is redundant.
Fixes: 7f92891778df ("vfio_pci: Add NVIDIA GV100GL [Tesla V100 SXM2] subdriver")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: kvm@vger.kernel.org
---
P.S.: This patch is part of a larger cleanup, but independent of other
patches and is intended to be picked up by the maintainer directly.
---
drivers/vfio/pci/trace.h | 6 +-----
drivers/vfio/pci/vfio_pci_nvlink2.c | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
--- a/drivers/vfio/pci/trace.h
+++ b/drivers/vfio/pci/trace.h
@@ -1,13 +1,9 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* VFIO PCI mmap/mmap_fault tracepoints
*
* Copyright (C) 2018 IBM Corp. All rights reserved.
* Author: Alexey Kardashevskiy <aik@ozlabs.ru>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
*/
#undef TRACE_SYSTEM
--- a/drivers/vfio/pci/vfio_pci_nvlink2.c
+++ b/drivers/vfio/pci/vfio_pci_nvlink2.c
@@ -1,14 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-only
/*
* VFIO PCI NVIDIA Whitherspoon GPU support a.k.a. NVLink2.
*
* Copyright (C) 2018 IBM Corp. All rights reserved.
* Author: Alexey Kardashevskiy <aik@ozlabs.ru>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
* Register an on-GPU RAM region for cacheable access.
*
* Derived from original vfio_pci_igd.c:
next prev parent reply other threads:[~2019-01-17 23:15 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-17 23:14 [patch 0/9] treewide: Cleanup recently added license mess Thomas Gleixner
2019-01-17 23:14 ` [patch 1/9] block: Cleanup license notice Thomas Gleixner
2019-01-18 2:53 ` Bart Van Assche
2019-01-18 4:21 ` Jens Axboe
2019-01-17 23:14 ` [patch 2/9] crypto: aegis - Cleanup license mess Thomas Gleixner
2019-01-18 8:02 ` Ondrej Mosnáček
2019-01-25 10:47 ` Herbert Xu
2019-01-17 23:14 ` [patch 3/9] crypto: morus " Thomas Gleixner
2019-01-18 0:26 ` Fabio Estevam
2019-01-18 6:50 ` Greg Kroah-Hartman
2019-01-18 8:00 ` Ondrej Mosnáček
2019-01-17 23:14 ` [patch 4/9] crypto: aegis - Convert to SPDX license identifiers Thomas Gleixner
2019-01-18 8:01 ` Ondrej Mosnáček
2019-01-17 23:14 ` [patch 5/9] crypto: morus " Thomas Gleixner
2019-01-18 8:02 ` Ondrej Mosnáček
2019-01-17 23:14 ` [patch 6/9] ceph: quota: Cleanup license mess Thomas Gleixner
2019-01-18 9:42 ` Luis Henriques
2019-01-18 10:48 ` Ilya Dryomov
2019-01-18 10:54 ` Thomas Gleixner
2019-01-17 23:14 ` [patch 7/9] smb3: " Thomas Gleixner
2019-01-19 5:43 ` Steve French
2019-01-17 23:14 ` [patch 8/9] tools: bpftool: " Thomas Gleixner
2019-01-17 23:24 ` Jakub Kicinski
2019-01-18 0:00 ` Thomas Gleixner
2019-01-18 23:28 ` Alexei Starovoitov
2019-01-17 23:14 ` Thomas Gleixner [this message]
2019-01-23 20:05 ` [patch 9/9] vfio/pci: " Alex Williamson
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=20190117231501.654003681@linutronix.de \
--to=tglx@linutronix.de \
--cc=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=corbet@lwn.net \
--cc=gregkh@linuxfoundation.org \
--cc=kstewart@linuxfoundation.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpe@ellerman.id.au \
/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).