I previously posted patches [1] to add SPDX tags to all drivers/pci files
except drivers/pci/hotplug/s390_pci_hpc.c. I omitted that one because it
contained only a "License: GPL" comment, which I thought was ambiguous.
However, I think it is actually unambiguous because the file was added with
a 'MODULE_LICENSE("GPL")', and include/linux/module.h shows that means "GPL
v2 or later".
So this patch adds the GPL-2.0+ tag to the file. I plan to include this
for v4.16 unless somebody objects.
[1] https://lkml.kernel.org/r/20180126212536.31503.43805.stgit@bhelgaas-glaptop.roam.corp.google.com
---
Bjorn Helgaas (1):
PCI: Add SPDX GPL-2.0+ to replace implicit GPL v2 or later statement
drivers/pci/hotplug/s390_pci_hpc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
From: Bjorn Helgaas <[email protected]>
7441b0627e22 ("s390/pci: PCI hotplug support via SCLP") added
s390_pci_hpc.c, which included this license information:
+MODULE_LICENSE("GPL");
Based on "git show 7441b0627e22:include/linux/module.h", that "GPL" string
means "GPL v2 or later":
* "GPL" [GNU Public License v2 or later]
0729dcf24832 ("s390: hotplug: make pci_hpc explicitly non-modular")
subsequently replaced the MODULE_LICENSE() with a "License: GPL" comment.
Add SPDX GPL-2.0+ and remove the "License: GPL" comment, relying on the
assertion in b24413180f56 ("License cleanup: add SPDX GPL-2.0 license
identifier to files with no license") that the SPDX identifier may be used
instead of the full boilerplate text.
Signed-off-by: Bjorn Helgaas <[email protected]>
---
drivers/pci/hotplug/s390_pci_hpc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c
index 530d0e49f2ed..ffdc2977395d 100644
--- a/drivers/pci/hotplug/s390_pci_hpc.c
+++ b/drivers/pci/hotplug/s390_pci_hpc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* PCI Hot Plug Controller Driver for System z
*
@@ -5,8 +6,6 @@
*
* Author(s):
* Jan Glauber <[email protected]>
- *
- * License: GPL
*/
#define KMSG_COMPONENT "zpci"
On Mon, Jan 29, 2018 at 06:40:52PM -0600, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <[email protected]>
>
> 7441b0627e22 ("s390/pci: PCI hotplug support via SCLP") added
> s390_pci_hpc.c, which included this license information:
>
> +MODULE_LICENSE("GPL");
>
> Based on "git show 7441b0627e22:include/linux/module.h", that "GPL" string
> means "GPL v2 or later":
>
> * "GPL" [GNU Public License v2 or later]
>
> 0729dcf24832 ("s390: hotplug: make pci_hpc explicitly non-modular")
> subsequently replaced the MODULE_LICENSE() with a "License: GPL" comment.
>
> Add SPDX GPL-2.0+ and remove the "License: GPL" comment, relying on the
> assertion in b24413180f56 ("License cleanup: add SPDX GPL-2.0 license
> identifier to files with no license") that the SPDX identifier may be used
> instead of the full boilerplate text.
>
> Signed-off-by: Bjorn Helgaas <[email protected]>
Reviewed-by: Greg Kroah-Hartman <[email protected]>
On Mon, 29 Jan 2018, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <[email protected]>
>
> 7441b0627e22 ("s390/pci: PCI hotplug support via SCLP") added
> s390_pci_hpc.c, which included this license information:
>
> +MODULE_LICENSE("GPL");
>
> Based on "git show 7441b0627e22:include/linux/module.h", that "GPL" string
> means "GPL v2 or later":
>
> * "GPL" [GNU Public License v2 or later]
>
> 0729dcf24832 ("s390: hotplug: make pci_hpc explicitly non-modular")
> subsequently replaced the MODULE_LICENSE() with a "License: GPL" comment.
>
> Add SPDX GPL-2.0+ and remove the "License: GPL" comment, relying on the
> assertion in b24413180f56 ("License cleanup: add SPDX GPL-2.0 license
> identifier to files with no license") that the SPDX identifier may be used
> instead of the full boilerplate text.
>
> Signed-off-by: Bjorn Helgaas <[email protected]>
Acked-by: Sebastian Ott <[email protected]>
Bjorn,
On Tue, Jan 30, 2018 at 1:40 AM, Bjorn Helgaas <[email protected]> wrote:
> I previously posted patches [1] to add SPDX tags to all drivers/pci files
> except drivers/pci/hotplug/s390_pci_hpc.c. I omitted that one because it
> contained only a "License: GPL" comment, which I thought was ambiguous.
>
> However, I think it is actually unambiguous because the file was added with
> a 'MODULE_LICENSE("GPL")', and include/linux/module.h shows that means "GPL
> v2 or later".
>
> So this patch adds the GPL-2.0+ tag to the file. I plan to include this
> for v4.16 unless somebody objects.
As I as said in a previous email, context matters a lot in these case
and you made the right choice.
When there is a MODULE_LICENSE and a super terse "GPL" license notice,
the two taken together can provide the proper context e.g. here
GPL-2.0+ rather than a less common GPL-1.0+
Thank you for your efforts there!
--
Cordially
Philippe Ombredanne
On Tue, Jan 30, 2018 at 1:40 AM, Bjorn Helgaas <[email protected]> wrote:
> From: Bjorn Helgaas <[email protected]>
>
> 7441b0627e22 ("s390/pci: PCI hotplug support via SCLP") added
> s390_pci_hpc.c, which included this license information:
>
> +MODULE_LICENSE("GPL");
>
> Based on "git show 7441b0627e22:include/linux/module.h", that "GPL" string
> means "GPL v2 or later":
>
> * "GPL" [GNU Public License v2 or later]
>
> 0729dcf24832 ("s390: hotplug: make pci_hpc explicitly non-modular")
> subsequently replaced the MODULE_LICENSE() with a "License: GPL" comment.
>
> Add SPDX GPL-2.0+ and remove the "License: GPL" comment, relying on the
> assertion in b24413180f56 ("License cleanup: add SPDX GPL-2.0 license
> identifier to files with no license") that the SPDX identifier may be used
> instead of the full boilerplate text.
>
> Signed-off-by: Bjorn Helgaas <[email protected]>
> ---
> drivers/pci/hotplug/s390_pci_hpc.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c
> index 530d0e49f2ed..ffdc2977395d 100644
> --- a/drivers/pci/hotplug/s390_pci_hpc.c
> +++ b/drivers/pci/hotplug/s390_pci_hpc.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> * PCI Hot Plug Controller Driver for System z
> *
> @@ -5,8 +6,6 @@
> *
> * Author(s):
> * Jan Glauber <[email protected]>
> - *
> - * License: GPL
> */
>
> #define KMSG_COMPONENT "zpci"
Thanks!
I have CCed too: Jan Glauber <[email protected]> too just in case!
Reviewed-by: Philippe Ombredanne <[email protected]>