* [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes)
@ 2023-05-12 10:06 Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 01/10] agp/amd64: Remove GPL distribution notice Bagas Sanjaya
` (10 more replies)
0 siblings, 11 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya
I trigger this patch series as a response to Didi's GPL full name fix
patches [1], for which all of them had been NAKed. In many cases, the
appropriate correction is to use SPDX license identifier instead.
Often, when replacing license notice boilerplates with their equivalent
SPDX identifier, the notice doesn't mention explicit GPL version. Greg
[2] replied this question by falling back to GPL 1.0 (more precisely
GPL 1.0+ in order to be compatible with GPL 2.0 used by Linux kernel),
although there are exceptions (mostly resolved by inferring from
older patches covering similar situation).
The series covers the same directories touched as Didi's ones, minus
Documentation/ (as should have been inferred by SPDX tags on respective
docs).
Changes since v1 ([3]):
* Cc: additional original authors that are missed in v1
* Pick up Reviewed-by: and Acked-by: tags from review
* Fix spdxcheck and SPDX-related checkpatch warnings
* Fix a few tag oversights.
[1]: https://lore.kernel.org/all/?q=f%3A%22didi.debian%40cknow.org%22+AND+s%3A%22GPL%22+AND+NOT+s%3A%22Re%3A%22
[2]: https://lore.kernel.org/all/20181028112728.GD8826@kroah.com/
[3]: https://lore.kernel.org/netdev/20230511133406.78155-1-bagasdotme@gmail.com/
Bagas Sanjaya (10):
agp/amd64: Remove GPL distribution notice
mISDN: Replace GPL notice boilerplate with SPDX identifier
net: bonding: Add SPDX identifier to remaining files
net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier
net: ethernet: i825xx: Replace GPL boilerplate with SPDX identifier
pcmcia: Add SPDX identifier
drivers: staging: wlan-ng: Remove GPL/MPL boilerplate
drivers: watchdog: Replace GPL license notice with SPDX identifier
udf: Replace license notice with SPDX identifier
include: synclink: Replace GPL license notice with SPDX identifier
drivers/char/agp/amd64-agp.c | 1 -
drivers/isdn/mISDN/dsp_audio.c | 4 +---
drivers/isdn/mISDN/dsp_blowfish.c | 4 +---
drivers/isdn/mISDN/dsp_cmx.c | 4 +---
drivers/isdn/mISDN/dsp_core.c | 3 +--
drivers/isdn/mISDN/dsp_dtmf.c | 4 +---
drivers/isdn/mISDN/dsp_tones.c | 4 +---
drivers/net/bonding/bond_main.c | 3 ++-
drivers/net/bonding/bonding_priv.h | 4 +---
drivers/net/ethernet/8390/8390.h | 2 ++
drivers/net/ethernet/8390/apne.c | 7 +------
drivers/net/ethernet/8390/axnet_cs.c | 6 +++---
drivers/net/ethernet/8390/hydra.c | 6 ++----
drivers/net/ethernet/8390/lib8390.c | 5 ++---
drivers/net/ethernet/8390/mac8390.c | 6 ++----
drivers/net/ethernet/8390/mcf8390.c | 4 +---
drivers/net/ethernet/8390/ne.c | 4 +---
drivers/net/ethernet/8390/ne2k-pci.c | 8 +-------
drivers/net/ethernet/8390/pcnet_cs.c | 5 ++---
drivers/net/ethernet/8390/smc-ultra.c | 4 +---
drivers/net/ethernet/8390/stnic.c | 5 +----
drivers/net/ethernet/8390/wd.c | 4 +---
drivers/net/ethernet/8390/zorro8390.c | 7 +------
drivers/net/ethernet/i825xx/82596.c | 5 ++---
drivers/net/ethernet/i825xx/lasi_82596.c | 5 ++---
drivers/net/ethernet/i825xx/lib82596.c | 5 ++---
drivers/net/ethernet/i825xx/sun3_82586.c | 4 +---
drivers/net/ethernet/i825xx/sun3_82586.h | 4 +---
drivers/pcmcia/bcm63xx_pcmcia.c | 5 +----
drivers/pcmcia/cirrus.h | 21 +------------------
drivers/pcmcia/i82365.c | 22 +-------------------
drivers/pcmcia/i82365.h | 21 +------------------
drivers/pcmcia/o2micro.h | 21 +------------------
drivers/pcmcia/pd6729.c | 3 +--
drivers/pcmcia/pxa2xx_base.h | 1 +
drivers/pcmcia/ricoh.h | 21 +------------------
drivers/pcmcia/sa1100_generic.c | 22 +-------------------
drivers/pcmcia/sa11xx_base.c | 22 +-------------------
drivers/pcmcia/sa11xx_base.h | 22 +-------------------
drivers/pcmcia/soc_common.c | 22 +-------------------
drivers/pcmcia/tcic.c | 22 +-------------------
drivers/pcmcia/tcic.h | 21 +------------------
drivers/pcmcia/ti113x.h | 21 +------------------
drivers/pcmcia/topic.h | 23 +--------------------
drivers/pcmcia/vg468.h | 21 +------------------
drivers/staging/wlan-ng/hfa384x.h | 21 -------------------
drivers/staging/wlan-ng/hfa384x_usb.c | 21 -------------------
drivers/staging/wlan-ng/p80211conv.c | 21 -------------------
drivers/staging/wlan-ng/p80211conv.h | 21 -------------------
drivers/staging/wlan-ng/p80211hdr.h | 21 -------------------
drivers/staging/wlan-ng/p80211ioctl.h | 21 -------------------
drivers/staging/wlan-ng/p80211metadef.h | 21 -------------------
drivers/staging/wlan-ng/p80211metastruct.h | 21 -------------------
drivers/staging/wlan-ng/p80211mgmt.h | 21 -------------------
drivers/staging/wlan-ng/p80211msg.h | 21 -------------------
drivers/staging/wlan-ng/p80211netdev.c | 21 -------------------
drivers/staging/wlan-ng/p80211netdev.h | 21 -------------------
drivers/staging/wlan-ng/p80211req.c | 21 -------------------
drivers/staging/wlan-ng/p80211req.h | 21 -------------------
drivers/staging/wlan-ng/p80211types.h | 21 -------------------
drivers/staging/wlan-ng/p80211wep.c | 21 -------------------
drivers/staging/wlan-ng/prism2fw.c | 21 -------------------
drivers/staging/wlan-ng/prism2mgmt.c | 21 -------------------
drivers/staging/wlan-ng/prism2mgmt.h | 21 -------------------
drivers/staging/wlan-ng/prism2mib.c | 21 -------------------
drivers/staging/wlan-ng/prism2sta.c | 21 -------------------
drivers/watchdog/ep93xx_wdt.c | 5 +----
drivers/watchdog/ibmasr.c | 3 +--
drivers/watchdog/m54xx_wdt.c | 4 +---
drivers/watchdog/max63xx_wdt.c | 5 +----
drivers/watchdog/moxart_wdt.c | 4 +---
drivers/watchdog/octeon-wdt-nmi.S | 5 +----
drivers/watchdog/orion_wdt.c | 4 +---
drivers/watchdog/rtd119x_wdt.c | 2 +-
drivers/watchdog/sb_wdog.c | 5 +----
drivers/watchdog/sbc_fitpc2_wdt.c | 4 +---
drivers/watchdog/ts4800_wdt.c | 4 +---
drivers/watchdog/ts72xx_wdt.c | 4 +---
fs/udf/balloc.c | 6 +-----
fs/udf/dir.c | 6 +-----
fs/udf/directory.c | 6 +-----
fs/udf/ecma_167.h | 24 +---------------------
fs/udf/file.c | 6 +-----
fs/udf/ialloc.c | 6 +-----
fs/udf/inode.c | 6 +-----
fs/udf/lowlevel.c | 6 +-----
fs/udf/misc.c | 6 +-----
fs/udf/namei.c | 6 +-----
fs/udf/osta_udf.h | 24 +---------------------
fs/udf/partition.c | 6 +-----
fs/udf/super.c | 6 +-----
fs/udf/symlink.c | 6 +-----
fs/udf/truncate.c | 6 +-----
fs/udf/udftime.c | 19 +----------------
fs/udf/unicode.c | 6 +-----
include/linux/synclink.h | 3 +--
include/net/bonding.h | 4 +---
97 files changed, 86 insertions(+), 1000 deletions(-)
base-commit: ac9a78681b921877518763ba0e89202254349d1b
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 01/10] agp/amd64: Remove GPL distribution notice
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
@ 2023-05-12 10:06 ` Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 02/10] mISDN: Replace GPL notice boilerplate with SPDX identifier Bagas Sanjaya
` (9 subsequent siblings)
10 siblings, 0 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya, Christophe JAILLET,
Simon Horman
There is already SPDX tag which does the job, so remove the redundant
notice.
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
drivers/char/agp/amd64-agp.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index ce8651436609fc..b93b0f836e52ba 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2001-2003 SuSE Labs.
- * Distributed under the GNU public license, v2.
*
* This is a GART driver for the AMD Opteron/Athlon64 on-CPU northbridge.
* It also includes support for the AMD 8151 AGP bridge,
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 02/10] mISDN: Replace GPL notice boilerplate with SPDX identifier
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 01/10] agp/amd64: Remove GPL distribution notice Bagas Sanjaya
@ 2023-05-12 10:06 ` Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 03/10] net: bonding: Add SPDX identifier to remaining files Bagas Sanjaya
` (8 subsequent siblings)
10 siblings, 0 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya, Stephen Hemminger,
Andreas Eversberg, Karsten Keil, Simon Horman
Replace unversioned GPL notice boilerplate on dsp_* with SPDX identifier
for GPL 1.0+. These files missed previous SPDX conversion batches
due to not specifying GPL version.
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Andreas Eversberg <jolly@eversberg.eu>
Cc: Karsten Keil <keil@isdn4linux.de>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
drivers/isdn/mISDN/dsp_audio.c | 4 +---
drivers/isdn/mISDN/dsp_blowfish.c | 4 +---
drivers/isdn/mISDN/dsp_cmx.c | 4 +---
drivers/isdn/mISDN/dsp_core.c | 3 +--
drivers/isdn/mISDN/dsp_dtmf.c | 4 +---
drivers/isdn/mISDN/dsp_tones.c | 4 +---
6 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/drivers/isdn/mISDN/dsp_audio.c b/drivers/isdn/mISDN/dsp_audio.c
index bbef98e7a16efb..df86c0ce9cd8d1 100644
--- a/drivers/isdn/mISDN/dsp_audio.c
+++ b/drivers/isdn/mISDN/dsp_audio.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* Audio support data for mISDN_dsp.
*
* Copyright 2002/2003 by Andreas Eversberg (jolly@eversberg.eu)
* Rewritten by Peter
*
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
*/
#include <linux/delay.h>
diff --git a/drivers/isdn/mISDN/dsp_blowfish.c b/drivers/isdn/mISDN/dsp_blowfish.c
index 0aa572f3858da7..e161c092012653 100644
--- a/drivers/isdn/mISDN/dsp_blowfish.c
+++ b/drivers/isdn/mISDN/dsp_blowfish.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* Blowfish encryption/decryption for mISDN_dsp.
*
* Copyright Andreas Eversberg (jolly@eversberg.eu)
*
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
*/
#include <linux/mISDNif.h>
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
index 357b87592eb48c..c2b24fdf234523 100644
--- a/drivers/isdn/mISDN/dsp_cmx.c
+++ b/drivers/isdn/mISDN/dsp_cmx.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* Audio crossconnecting/conferrencing (hardware level).
*
* Copyright 2002 by Andreas Eversberg (jolly@eversberg.eu)
*
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
*/
/*
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index 386084530c2f85..b9ec8489e690a0 100644
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* Author Andreas Eversberg (jolly@eversberg.eu)
* Based on source code structure by
* Karsten Keil (keil@isdn4linux.de)
*
- * This file is (c) under GNU PUBLIC LICENSE
- *
* Thanks to Karsten Keil (great drivers)
* Cologne Chip (great chips)
*
diff --git a/drivers/isdn/mISDN/dsp_dtmf.c b/drivers/isdn/mISDN/dsp_dtmf.c
index 642f30be5ce249..746c210a6d2495 100644
--- a/drivers/isdn/mISDN/dsp_dtmf.c
+++ b/drivers/isdn/mISDN/dsp_dtmf.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* DTMF decoder.
*
* Copyright by Andreas Eversberg (jolly@eversberg.eu)
* based on different decoders such as ISDN4Linux
*
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
*/
#include <linux/mISDNif.h>
diff --git a/drivers/isdn/mISDN/dsp_tones.c b/drivers/isdn/mISDN/dsp_tones.c
index 8389e2105cdcf6..16a47cc910c585 100644
--- a/drivers/isdn/mISDN/dsp_tones.c
+++ b/drivers/isdn/mISDN/dsp_tones.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* Audio support data for ISDN4Linux.
*
* Copyright Andreas Eversberg (jolly@eversberg.eu)
*
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
*/
#include <linux/gfp.h>
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 03/10] net: bonding: Add SPDX identifier to remaining files
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 01/10] agp/amd64: Remove GPL distribution notice Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 02/10] mISDN: Replace GPL notice boilerplate with SPDX identifier Bagas Sanjaya
@ 2023-05-12 10:06 ` Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier Bagas Sanjaya
` (7 subsequent siblings)
10 siblings, 0 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya, Thomas Davis,
Christophe JAILLET, Stephen Hemminger, Simon Horman
Previous batches of SPDX conversion missed bond_main.c and bonding_priv.h
because these files doesn't mention intended GPL version. Add SPDX identifier
to these files, assuming GPL 1.0+.
Cc: Thomas Davis <tadavis@lbl.gov>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
drivers/net/bonding/bond_main.c | 3 ++-
drivers/net/bonding/bonding_priv.h | 4 +---
include/net/bonding.h | 4 +---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 3fed888629f7b5..73059bff425729 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1,8 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* originally based on the dummy device.
*
* Copyright 1999, Thomas Davis, tadavis@lbl.gov.
- * Licensed under the GPL. Based on dummy.c, and eql.c devices.
+ * Based on dummy.c, and eql.c devices.
*
* bonding.c: an Ethernet Bonding driver
*
diff --git a/drivers/net/bonding/bonding_priv.h b/drivers/net/bonding/bonding_priv.h
index 48cdf3a49a7d74..fef6288c6944fb 100644
--- a/drivers/net/bonding/bonding_priv.h
+++ b/drivers/net/bonding/bonding_priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ */
/*
* Bond several ethernet interfaces into a Cisco, running 'Etherchannel'.
*
@@ -7,9 +8,6 @@
* BUT, I'm the one who modified it for ethernet, so:
* (c) Copyright 1999, Thomas Davis, tadavis@lbl.gov
*
- * This software may be used and distributed according to the terms
- * of the GNU Public License, incorporated herein by reference.
- *
*/
#ifndef _BONDING_PRIV_H
diff --git a/include/net/bonding.h b/include/net/bonding.h
index a60a24923b5599..50dfc9b939ecb7 100644
--- a/include/net/bonding.h
+++ b/include/net/bonding.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ */
/*
* Bond several ethernet interfaces into a Cisco, running 'Etherchannel'.
*
@@ -7,9 +8,6 @@
* BUT, I'm the one who modified it for ethernet, so:
* (c) Copyright 1999, Thomas Davis, tadavis@lbl.gov
*
- * This software may be used and distributed according to the terms
- * of the GNU Public License, incorporated herein by reference.
- *
*/
#ifndef _NET_BONDING_H
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
` (2 preceding siblings ...)
2023-05-12 10:06 ` [PATCH v2 03/10] net: bonding: Add SPDX identifier to remaining files Bagas Sanjaya
@ 2023-05-12 10:06 ` Bagas Sanjaya
2023-05-12 11:27 ` Geert Uytterhoeven
2023-05-12 13:03 ` Richard Fontana
2023-05-12 10:06 ` [PATCH v2 05/10] net: ethernet: i825xx: " Bagas Sanjaya
` (6 subsequent siblings)
10 siblings, 2 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya, David A . Hinds,
Donald Becker, Peter De Schrijver, Topi Kanerva, Alain Malek,
Bruce Abbott, Alan Cox, Greg Ungerer, Simon Horman
Replace GPL boilerplate notice on remaining files with appropriate SPDX
tag. For files mentioning COPYING, use GPL 2.0; otherwise GPL 1.0+.
Cc: David A. Hinds <dahinds@users.sourceforge.net>
Cc: Donald Becker <becker@scyld.com>
Cc: Peter De Schrijver <p2@mind.be>
Cc: Topi Kanerva <topi@susanna.oulu.fi>
Cc: Alain Malek <Alain.Malek@cryogen.com>
Cc: Bruce Abbott <bhabbott@inhb.co.nz>
Cc: Alan Cox <alan@linux.intel.com>
Acked-by: Greg Ungerer <gerg@linux-m68k.org>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
drivers/net/ethernet/8390/8390.h | 2 ++
drivers/net/ethernet/8390/apne.c | 7 +------
drivers/net/ethernet/8390/axnet_cs.c | 6 +++---
drivers/net/ethernet/8390/hydra.c | 6 ++----
drivers/net/ethernet/8390/lib8390.c | 5 ++---
drivers/net/ethernet/8390/mac8390.c | 6 ++----
drivers/net/ethernet/8390/mcf8390.c | 4 +---
drivers/net/ethernet/8390/ne.c | 4 +---
drivers/net/ethernet/8390/ne2k-pci.c | 8 +-------
drivers/net/ethernet/8390/pcnet_cs.c | 5 ++---
drivers/net/ethernet/8390/smc-ultra.c | 4 +---
drivers/net/ethernet/8390/stnic.c | 5 +----
drivers/net/ethernet/8390/wd.c | 4 +---
drivers/net/ethernet/8390/zorro8390.c | 7 +------
14 files changed, 21 insertions(+), 52 deletions(-)
diff --git a/drivers/net/ethernet/8390/8390.h b/drivers/net/ethernet/8390/8390.h
index e5226446599884..f784a6e2ab0ed3 100644
--- a/drivers/net/ethernet/8390/8390.h
+++ b/drivers/net/ethernet/8390/8390.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-1.0+ */
+
/* Generic NS8390 register definitions. */
/* This file is part of Donald Becker's 8390 drivers, and is distributed
diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c
index 991ad953aa7906..bf9a95875b0b20 100644
--- a/drivers/net/ethernet/8390/apne.c
+++ b/drivers/net/ethernet/8390/apne.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* Amiga Linux/68k 8390 based PCMCIA Ethernet Driver for the Amiga 1200
*
@@ -19,12 +20,6 @@
*
* ----------------------------------------------------------------------------
*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file COPYING in the main directory of the Linux
- * distribution for more details.
- *
- * ----------------------------------------------------------------------------
- *
*/
diff --git a/drivers/net/ethernet/8390/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c
index 78f985885547ea..fea489af72fb0b 100644
--- a/drivers/net/ethernet/8390/axnet_cs.c
+++ b/drivers/net/ethernet/8390/axnet_cs.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-1.0+
+
/*======================================================================
A PCMCIA ethernet driver for Asix AX88190-based cards
@@ -17,9 +19,7 @@
Written 1992,1993 by Donald Becker.
Copyright 1993 United States Government as represented by the
- Director, National Security Agency. This software may be used and
- distributed according to the terms of the GNU General Public License,
- incorporated herein by reference.
+ Director, National Security Agency.
Donald Becker may be reached at becker@scyld.com
======================================================================*/
diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c
index 1df7601af86a40..1c3dd9a2847543 100644
--- a/drivers/net/ethernet/8390/hydra.c
+++ b/drivers/net/ethernet/8390/hydra.c
@@ -1,10 +1,8 @@
+// SPDX-License-Identifier: GPL-1.0+
+
/* New Hydra driver using generic 8390 core */
/* Based on old hydra driver by Topi Kanerva (topi@susanna.oulu.fi) */
-/* This file is subject to the terms and conditions of the GNU General */
-/* Public License. See the file COPYING in the main directory of the */
-/* Linux distribution for more details. */
-
/* Peter De Schrijver (p2@mind.be) */
/* Oldenburg 2000 */
diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c
index e84021282edf30..84aeb8054304f9 100644
--- a/drivers/net/ethernet/8390/lib8390.c
+++ b/drivers/net/ethernet/8390/lib8390.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-1.0+
+
/* 8390.c: A general NS8390 ethernet driver core for linux. */
/*
Written 1992-94 by Donald Becker.
@@ -5,9 +7,6 @@
Copyright 1993 United States Government as represented by the
Director, National Security Agency.
- This software may be used and distributed according to the terms
- of the GNU General Public License, incorporated herein by reference.
-
The author may be reached as becker@scyld.com, or C/O
Scyld Computing Corporation
410 Severn Ave., Suite 210
diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index 7fb819b9b89a5b..4a0a095a1a8a0a 100644
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
/* mac8390.c: New driver for 8390-based Nubus (or Nubus-alike)
Ethernet cards on Linux */
/* Based on the former daynaport.c driver, by Alan Cox. Some code
taken from or inspired by skeleton.c by Donald Becker, acenic.c by
- Jes Sorensen, and ne2k-pci.c by Donald Becker and Paul Gortmaker.
-
- This software may be used and distributed according to the terms of
- the GNU Public License, incorporated herein by reference. */
+ Jes Sorensen, and ne2k-pci.c by Donald Becker and Paul Gortmaker. */
/* 2000-02-28: support added for Dayna and Kinetics cards by
A.G.deWijn@phys.uu.nl */
diff --git a/drivers/net/ethernet/8390/mcf8390.c b/drivers/net/ethernet/8390/mcf8390.c
index 8a7918d3341965..217838b2822025 100644
--- a/drivers/net/ethernet/8390/mcf8390.c
+++ b/drivers/net/ethernet/8390/mcf8390.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Support for ColdFire CPU based boards using a NS8390 Ethernet device.
*
@@ -5,9 +6,6 @@
*
* (C) Copyright 2012, Greg Ungerer <gerg@uclinux.org>
*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file COPYING in the main directory of the Linux
- * distribution for more details.
*/
#include <linux/module.h>
diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c
index 0a9118b8be0c64..cb04a3071f92d4 100644
--- a/drivers/net/ethernet/8390/ne.c
+++ b/drivers/net/ethernet/8390/ne.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/* ne.c: A general non-shared-memory NS8390 ethernet driver for linux. */
/*
Written 1992-94 by Donald Becker.
@@ -5,9 +6,6 @@
Copyright 1993 United States Government as represented by the
Director, National Security Agency.
- This software may be used and distributed according to the terms
- of the GNU General Public License, incorporated herein by reference.
-
The author may be reached as becker@scyld.com, or C/O
Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403
diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index 6a0a2039600a0a..ea3488e81c5f3c 100644
--- a/drivers/net/ethernet/8390/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/* A Linux device driver for PCI NE2000 clones.
*
* Authors and other copyright holders:
@@ -6,13 +7,6 @@
* Copyright 1993 assigned to the United States Government as represented
* by the Director, National Security Agency.
*
- * This software may be used and distributed according to the terms of
- * the GNU General Public License (GPL), incorporated herein by reference.
- * Drivers based on or derived from this code fall under the GPL and must
- * retain the authorship, copyright and license notice. This file is not
- * a complete program and may only be used when the entire operating
- * system is licensed under the GPL.
- *
* The author may be reached as becker@scyld.com, or C/O
* Scyld Computing Corporation
* 410 Severn Ave., Suite 210
diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c
index 0f07fe03da98c8..9bd5e991f1e52b 100644
--- a/drivers/net/ethernet/8390/pcnet_cs.c
+++ b/drivers/net/ethernet/8390/pcnet_cs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/*======================================================================
A PCMCIA ethernet driver for NS8390-based cards
@@ -17,9 +18,7 @@
Written 1992,1993 by Donald Becker.
Copyright 1993 United States Government as represented by the
- Director, National Security Agency. This software may be used and
- distributed according to the terms of the GNU General Public License,
- incorporated herein by reference.
+ Director, National Security Agency.
Donald Becker may be reached at becker@scyld.com
Based also on Keith Moore's changes to Don Becker's code, for IBM
diff --git a/drivers/net/ethernet/8390/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c
index 6e62c37c940056..ae10b7de41e8f1 100644
--- a/drivers/net/ethernet/8390/smc-ultra.c
+++ b/drivers/net/ethernet/8390/smc-ultra.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/* smc-ultra.c: A SMC Ultra ethernet driver for linux. */
/*
This is a driver for the SMC Ultra and SMC EtherEZ ISA ethercards.
@@ -7,9 +8,6 @@
Copyright 1993 United States Government as represented by the
Director, National Security Agency.
- This software may be used and distributed according to the terms
- of the GNU General Public License, incorporated herein by reference.
-
The author may be reached as becker@scyld.com, or C/O
Scyld Computing Corporation
410 Severn Ave., Suite 210
diff --git a/drivers/net/ethernet/8390/stnic.c b/drivers/net/ethernet/8390/stnic.c
index bd89ca8a92dfbc..265976e3b64ab2 100644
--- a/drivers/net/ethernet/8390/stnic.c
+++ b/drivers/net/ethernet/8390/stnic.c
@@ -1,8 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-only
/* stnic.c : A SH7750 specific part of driver for NS DP83902A ST-NIC.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
*
* Copyright (C) 1999 kaz Kojima
*/
diff --git a/drivers/net/ethernet/8390/wd.c b/drivers/net/ethernet/8390/wd.c
index 5b00c452bede64..9a36667d00b65c 100644
--- a/drivers/net/ethernet/8390/wd.c
+++ b/drivers/net/ethernet/8390/wd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/* wd.c: A WD80x3 ethernet driver for linux. */
/*
Written 1993-94 by Donald Becker.
@@ -5,9 +6,6 @@
Copyright 1993 United States Government as represented by the
Director, National Security Agency.
- This software may be used and distributed according to the terms
- of the GNU General Public License, incorporated herein by reference.
-
The author may be reached as becker@scyld.com, or C/O
Scyld Computing Corporation
410 Severn Ave., Suite 210
diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
index e8b4fe813a0828..d70390e9d03d9b 100644
--- a/drivers/net/ethernet/8390/zorro8390.c
+++ b/drivers/net/ethernet/8390/zorro8390.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Amiga Linux/m68k and Linux/PPC Zorro NS8390 Ethernet Driver
*
@@ -9,12 +10,6 @@
*
* ---------------------------------------------------------------------------
*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file COPYING in the main directory of the Linux
- * distribution for more details.
- *
- * ---------------------------------------------------------------------------
- *
* The Ariadne II and X-Surf are Zorro-II boards containing Realtek RTL8019AS
* Ethernet Controllers.
*/
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 05/10] net: ethernet: i825xx: Replace GPL boilerplate with SPDX identifier
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
` (3 preceding siblings ...)
2023-05-12 10:06 ` [PATCH v2 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier Bagas Sanjaya
@ 2023-05-12 10:06 ` Bagas Sanjaya
2023-05-12 11:21 ` Greg Kroah-Hartman
2023-05-12 10:06 ` [PATCH v2 06/10] pcmcia: Add " Bagas Sanjaya
` (5 subsequent siblings)
10 siblings, 1 reply; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya, Donald Becker,
Michael Hipp, Richard Hirst, Simon Horman
Replace unversioned GPL boilerplate notice on remaining i825xx files
with appropriate SPDX identifier. For files that contains "extension to
Linux kernel", use GPL 2.0, otherwise GPL 1.0+.
Cc: Donald Becker <becker@scyld.com>
Cc: Michael Hipp <hippm@informatik.uni-tuebingen.de>
Cc: Richard Hirst <richard@sleepie.demon.co.uk>
Cc: Sam Creasey <sammy@sammy.net>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
drivers/net/ethernet/i825xx/82596.c | 5 ++---
drivers/net/ethernet/i825xx/lasi_82596.c | 5 ++---
drivers/net/ethernet/i825xx/lib82596.c | 5 ++---
drivers/net/ethernet/i825xx/sun3_82586.c | 4 +---
drivers/net/ethernet/i825xx/sun3_82586.h | 4 +---
5 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/i825xx/82596.c b/drivers/net/ethernet/i825xx/82596.c
index 3ee89ae496d0ca..773d7aa29ef5fc 100644
--- a/drivers/net/ethernet/i825xx/82596.c
+++ b/drivers/net/ethernet/i825xx/82596.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/* 82596.c: A generic 82596 ethernet driver for linux. */
/*
Based on Apricot.c
@@ -31,9 +32,7 @@
Driver skeleton
Written 1993 by Donald Becker.
Copyright 1993 United States Government as represented by the Director,
- National Security Agency. This software may only be used and distributed
- according to the terms of the GNU General Public License as modified by SRC,
- incorporated herein by reference.
+ National Security Agency.
The author may be reached as becker@scyld.com, or C/O
Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403
diff --git a/drivers/net/ethernet/i825xx/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c
index 0af70094aba341..3e53e0c243ba04 100644
--- a/drivers/net/ethernet/i825xx/lasi_82596.c
+++ b/drivers/net/ethernet/i825xx/lasi_82596.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/* lasi_82596.c -- driver for the intel 82596 ethernet controller, as
munged into HPPA boxen .
@@ -59,9 +60,7 @@
Driver skeleton
Written 1993 by Donald Becker.
Copyright 1993 United States Government as represented by the Director,
- National Security Agency. This software may only be used and distributed
- according to the terms of the GNU General Public License as modified by SRC,
- incorporated herein by reference.
+ National Security Agency.
The author may be reached as becker@scyld.com, or C/O
Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403
diff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c
index ca2fb303fcc6f6..67d248a7a6f49e 100644
--- a/drivers/net/ethernet/i825xx/lib82596.c
+++ b/drivers/net/ethernet/i825xx/lib82596.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/* lasi_82596.c -- driver for the intel 82596 ethernet controller, as
munged into HPPA boxen .
@@ -59,9 +60,7 @@
Driver skeleton
Written 1993 by Donald Becker.
Copyright 1993 United States Government as represented by the Director,
- National Security Agency. This software may only be used and distributed
- according to the terms of the GNU General Public License as modified by SRC,
- incorporated herein by reference.
+ National Security Agency.
The author may be reached as becker@scyld.com, or C/O
Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403
diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
index 3909c6a0af89f9..f05f016cb3b0ea 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.c
+++ b/drivers/net/ethernet/i825xx/sun3_82586.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Sun3 i82586 Ethernet driver
*
@@ -8,9 +9,6 @@
*
* net-3-driver for the NI5210 card (i82586 Ethernet chip)
*
- * This is an extension to the Linux operating system, and is covered by the
- * same Gnu Public License that covers that work.
- *
* Alphacode 0.82 (96/09/29) for Linux 2.0.0 (or later)
* Copyrights (c) 1994,1995,1996 by M.Hipp (hippm@informatik.uni-tuebingen.de)
* --------------------------
diff --git a/drivers/net/ethernet/i825xx/sun3_82586.h b/drivers/net/ethernet/i825xx/sun3_82586.h
index d82eca563266a1..82702b32c61fec 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.h
+++ b/drivers/net/ethernet/i825xx/sun3_82586.h
@@ -1,9 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Intel i82586 Ethernet definitions
*
- * This is an extension to the Linux operating system, and is covered by the
- * same Gnu Public License that covers that work.
- *
* copyrights (c) 1994 by Michael Hipp (hippm@informatik.uni-tuebingen.de)
*
* I have done a look in the following sources:
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 06/10] pcmcia: Add SPDX identifier
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
` (4 preceding siblings ...)
2023-05-12 10:06 ` [PATCH v2 05/10] net: ethernet: i825xx: " Bagas Sanjaya
@ 2023-05-12 10:06 ` Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 07/10] drivers: staging: wlan-ng: Remove GPL/MPL boilerplate Bagas Sanjaya
` (4 subsequent siblings)
10 siblings, 0 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya, Maxime Bizon,
David A . Hinds, John G . Dorsey, Simon Horman
Add SPDX identifier on remaining files untouched during previous
rounds of SPDX conversion while replacing boilerplate notice if any.
Cc: Maxime Bizon <mbizon@freebox.fr>
Cc: David A. Hinds <dahinds@users.sourceforge.net>
Cc: John G. Dorsey <john+@cs.cmu.edu>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
drivers/pcmcia/bcm63xx_pcmcia.c | 5 +----
drivers/pcmcia/cirrus.h | 21 +--------------------
drivers/pcmcia/i82365.c | 22 +---------------------
drivers/pcmcia/i82365.h | 21 +--------------------
drivers/pcmcia/o2micro.h | 21 +--------------------
drivers/pcmcia/pd6729.c | 3 +--
drivers/pcmcia/pxa2xx_base.h | 1 +
drivers/pcmcia/ricoh.h | 21 +--------------------
drivers/pcmcia/sa1100_generic.c | 22 +---------------------
drivers/pcmcia/sa11xx_base.c | 22 +---------------------
drivers/pcmcia/sa11xx_base.h | 22 +---------------------
drivers/pcmcia/soc_common.c | 22 +---------------------
drivers/pcmcia/tcic.c | 22 +---------------------
drivers/pcmcia/tcic.h | 21 +--------------------
drivers/pcmcia/ti113x.h | 21 +--------------------
drivers/pcmcia/topic.h | 23 +----------------------
drivers/pcmcia/vg468.h | 21 +--------------------
17 files changed, 17 insertions(+), 294 deletions(-)
diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c
index dd3c2609904877..0564bcabf85dc9 100644
--- a/drivers/pcmcia/bcm63xx_pcmcia.c
+++ b/drivers/pcmcia/bcm63xx_pcmcia.c
@@ -1,8 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
* Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
*/
diff --git a/drivers/pcmcia/cirrus.h b/drivers/pcmcia/cirrus.h
index 446a4576e73e6c..8d3a256c97a087 100644
--- a/drivers/pcmcia/cirrus.h
+++ b/drivers/pcmcia/cirrus.h
@@ -1,30 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */
/*
* cirrus.h 1.4 1999/10/25 20:03:34
*
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License
- * at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and
- * limitations under the License.
- *
* The initial developer of the original code is David A. Hinds
* <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
* are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
*
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the GPL. If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the GPL.
*/
#ifndef _LINUX_CIRRUS_H
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index 891ccea2cccb0a..a7b50c7201215f 100644
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -1,34 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1
/*======================================================================
Device driver for Intel 82365 and compatible PC Card controllers.
i82365.c 1.265 1999/11/10 18:36:21
- The contents of this file are subject to the Mozilla Public
- License Version 1.1 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
The initial developer of the original code is David A. Hinds
<dahinds@users.sourceforge.net>. Portions created by David A. Hinds
are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
- Alternatively, the contents of this file may be used under the
- terms of the GNU General Public License version 2 (the "GPL"), in which
- case the provisions of the GPL are applicable instead of the
- above. If you wish to allow the use of your version of this file
- only under the terms of the GPL and not to allow others to use
- your version of this file under the MPL, indicate your decision
- by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL. If you do not delete
- the provisions above, a recipient may use your version of this
- file under either the MPL or the GPL.
-
======================================================================*/
#include <linux/module.h>
diff --git a/drivers/pcmcia/i82365.h b/drivers/pcmcia/i82365.h
index 3f84d7a2dc84fa..5501001c7dd8ab 100644
--- a/drivers/pcmcia/i82365.h
+++ b/drivers/pcmcia/i82365.h
@@ -1,30 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */
/*
* i82365.h 1.15 1999/10/25 20:03:34
*
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License
- * at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and
- * limitations under the License.
- *
* The initial developer of the original code is David A. Hinds
* <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
* are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
*
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the GPL. If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the GPL.
*/
#ifndef _LINUX_I82365_H
diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h
index 5096e92c7a4cfb..8b828c0932950c 100644
--- a/drivers/pcmcia/o2micro.h
+++ b/drivers/pcmcia/o2micro.h
@@ -1,30 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */
/*
* o2micro.h 1.13 1999/10/25 20:03:34
*
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License
- * at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and
- * limitations under the License.
- *
* The initial developer of the original code is David A. Hinds
* <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
* are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
*
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the GPL. If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the GPL.
*/
#ifndef _LINUX_O2MICRO_H
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index a0a2e7f18356c5..d6a28fa6da840b 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* Driver for the Cirrus PD6729 PCI-PCMCIA bridge.
*
* Based on the i82092.c driver.
*
- * This software may be used and distributed according to the terms of
- * the GNU General Public License, incorporated herein by reference.
*/
#include <linux/kernel.h>
diff --git a/drivers/pcmcia/pxa2xx_base.h b/drivers/pcmcia/pxa2xx_base.h
index e58c7a41541880..9583d08983f5cd 100644
--- a/drivers/pcmcia/pxa2xx_base.h
+++ b/drivers/pcmcia/pxa2xx_base.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt);
void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops);
void pxa2xx_configure_sockets(struct device *dev, struct pcmcia_low_level *ops);
diff --git a/drivers/pcmcia/ricoh.h b/drivers/pcmcia/ricoh.h
index 8ac7b138c09486..f037169f6108f7 100644
--- a/drivers/pcmcia/ricoh.h
+++ b/drivers/pcmcia/ricoh.h
@@ -1,30 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */
/*
* ricoh.h 1.9 1999/10/25 20:03:34
*
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License
- * at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and
- * limitations under the License.
- *
* The initial developer of the original code is David A. Hinds
* <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
* are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
*
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the GPL. If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the GPL.
*/
#ifndef _LINUX_RICOH_H
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 89d4ba58c89135..9ec190ab29a89e 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -1,33 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1
/*======================================================================
Device driver for the PCMCIA control functionality of StrongARM
SA-1100 microprocessors.
- The contents of this file are subject to the Mozilla Public
- License Version 1.1 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
The initial developer of the original code is John G. Dorsey
<john+@cs.cmu.edu>. Portions created by John G. Dorsey are
Copyright (C) 1999 John G. Dorsey. All Rights Reserved.
- Alternatively, the contents of this file may be used under the
- terms of the GNU Public License version 2 (the "GPL"), in which
- case the provisions of the GPL are applicable instead of the
- above. If you wish to allow the use of your version of this file
- only under the terms of the GPL and not to allow others to use
- your version of this file under the MPL, indicate your decision
- by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL. If you do not delete
- the provisions above, a recipient may use your version of this
- file under either the MPL or the GPL.
-
======================================================================*/
#include <linux/module.h>
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index 48140ac73ed632..3e9b3b0c9b0817 100644
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -1,33 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1
/*======================================================================
Device driver for the PCMCIA control functionality of StrongARM
SA-1100 microprocessors.
- The contents of this file are subject to the Mozilla Public
- License Version 1.1 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
The initial developer of the original code is John G. Dorsey
<john+@cs.cmu.edu>. Portions created by John G. Dorsey are
Copyright (C) 1999 John G. Dorsey. All Rights Reserved.
- Alternatively, the contents of this file may be used under the
- terms of the GNU Public License version 2 (the "GPL"), in which
- case the provisions of the GPL are applicable instead of the
- above. If you wish to allow the use of your version of this file
- only under the terms of the GPL and not to allow others to use
- your version of this file under the MPL, indicate your decision
- by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL. If you do not delete
- the provisions above, a recipient may use your version of this
- file under either the MPL or the GPL.
-
======================================================================*/
#include <linux/module.h>
diff --git a/drivers/pcmcia/sa11xx_base.h b/drivers/pcmcia/sa11xx_base.h
index 3d76d720f463de..c2dbdc5495f78e 100644
--- a/drivers/pcmcia/sa11xx_base.h
+++ b/drivers/pcmcia/sa11xx_base.h
@@ -1,33 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */
/*======================================================================
Device driver for the PCMCIA control functionality of StrongARM
SA-1100 microprocessors.
- The contents of this file are subject to the Mozilla Public
- License Version 1.1 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
The initial developer of the original code is John G. Dorsey
<john+@cs.cmu.edu>. Portions created by John G. Dorsey are
Copyright (C) 1999 John G. Dorsey. All Rights Reserved.
- Alternatively, the contents of this file may be used under the
- terms of the GNU Public License version 2 (the "GPL"), in which
- case the provisions of the GPL are applicable instead of the
- above. If you wish to allow the use of your version of this file
- only under the terms of the GPL and not to allow others to use
- your version of this file under the MPL, indicate your decision
- by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL. If you do not delete
- the provisions above, a recipient may use your version of this
- file under either the MPL or the GPL.
-
======================================================================*/
#if !defined(_PCMCIA_SA1100_H)
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 61b0c8952bb5e0..8b035367fd4268 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -1,33 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1
/*======================================================================
Common support code for the PCMCIA control functionality of
integrated SOCs like the SA-11x0 and PXA2xx microprocessors.
- The contents of this file are subject to the Mozilla Public
- License Version 1.1 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
The initial developer of the original code is John G. Dorsey
<john+@cs.cmu.edu>. Portions created by John G. Dorsey are
Copyright (C) 1999 John G. Dorsey. All Rights Reserved.
- Alternatively, the contents of this file may be used under the
- terms of the GNU Public License version 2 (the "GPL"), in which
- case the provisions of the GPL are applicable instead of the
- above. If you wish to allow the use of your version of this file
- only under the terms of the GPL and not to allow others to use
- your version of this file under the MPL, indicate your decision
- by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL. If you do not delete
- the provisions above, a recipient may use your version of this
- file under either the MPL or the GPL.
-
======================================================================*/
diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
index 1a0e3f0987599d..a5fca2d14c1257 100644
--- a/drivers/pcmcia/tcic.c
+++ b/drivers/pcmcia/tcic.c
@@ -1,34 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1
/*======================================================================
Device driver for Databook TCIC-2 PCMCIA controller
tcic.c 1.111 2000/02/15 04:13:12
- The contents of this file are subject to the Mozilla Public
- License Version 1.1 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS
- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. See the License for the specific language governing
- rights and limitations under the License.
-
The initial developer of the original code is David A. Hinds
<dahinds@users.sourceforge.net>. Portions created by David A. Hinds
are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
- Alternatively, the contents of this file may be used under the
- terms of the GNU General Public License version 2 (the "GPL"), in which
- case the provisions of the GPL are applicable instead of the
- above. If you wish to allow the use of your version of this file
- only under the terms of the GPL and not to allow others to use
- your version of this file under the MPL, indicate your decision
- by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL. If you do not delete
- the provisions above, a recipient may use your version of this
- file under either the MPL or the GPL.
-
======================================================================*/
#include <linux/module.h>
diff --git a/drivers/pcmcia/tcic.h b/drivers/pcmcia/tcic.h
index 2c0b8f65ad6c6f..aff1e65fc69032 100644
--- a/drivers/pcmcia/tcic.h
+++ b/drivers/pcmcia/tcic.h
@@ -1,30 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */
/*
* tcic.h 1.13 1999/10/25 20:03:34
*
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License
- * at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and
- * limitations under the License.
- *
* The initial developer of the original code is David A. Hinds
* <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
* are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
*
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the GPL. If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the GPL.
*/
#ifndef _LINUX_TCIC_H
diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h
index 5cb670e037a0c6..a65ab56551ee93 100644
--- a/drivers/pcmcia/ti113x.h
+++ b/drivers/pcmcia/ti113x.h
@@ -1,30 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */
/*
* ti113x.h 1.16 1999/10/25 20:03:34
*
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License
- * at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and
- * limitations under the License.
- *
* The initial developer of the original code is David A. Hinds
* <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
* are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
*
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the GPL. If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the GPL.
*/
#ifndef _LINUX_TI113X_H
diff --git a/drivers/pcmcia/topic.h b/drivers/pcmcia/topic.h
index 582688fe750540..d1ad01abab13f4 100644
--- a/drivers/pcmcia/topic.h
+++ b/drivers/pcmcia/topic.h
@@ -1,31 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */
/*
* topic.h 1.8 1999/08/28 04:01:47
*
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License
- * at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and
- * limitations under the License.
- *
* The initial developer of the original code is David A. Hinds
* <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
* are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the GPL. If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the GPL.
- * topic.h $Release$ 1999/08/28 04:01:47
*/
#ifndef _LINUX_TOPIC_H
diff --git a/drivers/pcmcia/vg468.h b/drivers/pcmcia/vg468.h
index 88c2b487f675fc..c582fc8086c26d 100644
--- a/drivers/pcmcia/vg468.h
+++ b/drivers/pcmcia/vg468.h
@@ -1,30 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */
/*
* vg468.h 1.11 1999/10/25 20:03:34
*
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License
- * at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and
- * limitations under the License.
- *
* The initial developer of the original code is David A. Hinds
* <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
* are Copyright (C) 1999 David A. Hinds. All Rights Reserved.
*
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the GPL. If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the MPL or the GPL.
*/
#ifndef _LINUX_VG468_H
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 07/10] drivers: staging: wlan-ng: Remove GPL/MPL boilerplate
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
` (5 preceding siblings ...)
2023-05-12 10:06 ` [PATCH v2 06/10] pcmcia: Add " Bagas Sanjaya
@ 2023-05-12 10:06 ` Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier Bagas Sanjaya
` (3 subsequent siblings)
10 siblings, 0 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya, Dan Carpenter,
Simon Horman
Remove the license boilerplate as there is already SPDX license
identifier added in b24413180f5600 ("License cleanup: add SPDX GPL-2.0
license identifier to files with no license") which fulfills the same
intention as the boilerplate.
Cc: Dan Carpenter <error27@gmail.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
drivers/staging/wlan-ng/hfa384x.h | 21 ---------------------
drivers/staging/wlan-ng/hfa384x_usb.c | 21 ---------------------
drivers/staging/wlan-ng/p80211conv.c | 21 ---------------------
drivers/staging/wlan-ng/p80211conv.h | 21 ---------------------
drivers/staging/wlan-ng/p80211hdr.h | 21 ---------------------
drivers/staging/wlan-ng/p80211ioctl.h | 21 ---------------------
drivers/staging/wlan-ng/p80211metadef.h | 21 ---------------------
drivers/staging/wlan-ng/p80211metastruct.h | 21 ---------------------
drivers/staging/wlan-ng/p80211mgmt.h | 21 ---------------------
drivers/staging/wlan-ng/p80211msg.h | 21 ---------------------
drivers/staging/wlan-ng/p80211netdev.c | 21 ---------------------
drivers/staging/wlan-ng/p80211netdev.h | 21 ---------------------
drivers/staging/wlan-ng/p80211req.c | 21 ---------------------
drivers/staging/wlan-ng/p80211req.h | 21 ---------------------
drivers/staging/wlan-ng/p80211types.h | 21 ---------------------
drivers/staging/wlan-ng/p80211wep.c | 21 ---------------------
drivers/staging/wlan-ng/prism2fw.c | 21 ---------------------
drivers/staging/wlan-ng/prism2mgmt.c | 21 ---------------------
drivers/staging/wlan-ng/prism2mgmt.h | 21 ---------------------
drivers/staging/wlan-ng/prism2mib.c | 21 ---------------------
drivers/staging/wlan-ng/prism2sta.c | 21 ---------------------
21 files changed, 441 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
index e33dd1b9c40e58..a4799589e46945 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index c7cd54171d9943..3e8c92675c8234 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index cd271b1da69f64..048e1c3fe19b32 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h
index dfb762bce84d07..45234769f45d6e 100644
--- a/drivers/staging/wlan-ng/p80211conv.h
+++ b/drivers/staging/wlan-ng/p80211conv.h
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211hdr.h b/drivers/staging/wlan-ng/p80211hdr.h
index 93195a4c5b014a..7ea1c8ec05ed05 100644
--- a/drivers/staging/wlan-ng/p80211hdr.h
+++ b/drivers/staging/wlan-ng/p80211hdr.h
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211ioctl.h b/drivers/staging/wlan-ng/p80211ioctl.h
index b50ce11147dd78..176e327a45bc4b 100644
--- a/drivers/staging/wlan-ng/p80211ioctl.h
+++ b/drivers/staging/wlan-ng/p80211ioctl.h
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h
index 1b91b64c12ed1a..1cbb4b67a9a6a6 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -6,27 +6,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211metastruct.h b/drivers/staging/wlan-ng/p80211metastruct.h
index 4adc64580185a1..ea8b7ee108171f 100644
--- a/drivers/staging/wlan-ng/p80211metastruct.h
+++ b/drivers/staging/wlan-ng/p80211metastruct.h
@@ -6,27 +6,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h
index fc23fae5651b9e..7ffc202d90074b 100644
--- a/drivers/staging/wlan-ng/p80211mgmt.h
+++ b/drivers/staging/wlan-ng/p80211mgmt.h
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211msg.h b/drivers/staging/wlan-ng/p80211msg.h
index f68d8b7d5ad883..d56bc6079ed4f8 100644
--- a/drivers/staging/wlan-ng/p80211msg.h
+++ b/drivers/staging/wlan-ng/p80211msg.h
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index 6bef419e8ad0c8..8634fc89a6c22f 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h
index 1cee51a1075ed6..f5186380b6290a 100644
--- a/drivers/staging/wlan-ng/p80211netdev.h
+++ b/drivers/staging/wlan-ng/p80211netdev.h
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index 809cf3d480e952..6ec559ffd2f991 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211req.h b/drivers/staging/wlan-ng/p80211req.h
index bc45cd5f91e464..39213f73913c56 100644
--- a/drivers/staging/wlan-ng/p80211req.h
+++ b/drivers/staging/wlan-ng/p80211req.h
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h
index b2ed969604133e..5e4ea5f92058e5 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -9,27 +9,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/p80211wep.c b/drivers/staging/wlan-ng/p80211wep.c
index 3ff7ee7011df35..e7b26b057124ab 100644
--- a/drivers/staging/wlan-ng/p80211wep.c
+++ b/drivers/staging/wlan-ng/p80211wep.c
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c
index 11658865ca5050..5d03b2b9aab40a 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index 9030a8939a9bf3..e7820b212b4fa1 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/prism2mgmt.h b/drivers/staging/wlan-ng/prism2mgmt.h
index 7132cec2d7eb80..083a055ee98662 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.h
+++ b/drivers/staging/wlan-ng/prism2mgmt.h
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index fcf8313870af48..4346b90c1a770e 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index daa7cc4e897c91..57180bb71699f7 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -8,27 +8,6 @@
*
* linux-wlan
*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License version 2 (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of the
- * above. If you wish to allow the use of your version of this file
- * only under the terms of the GPL and not to allow others to use
- * your version of this file under the MPL, indicate your decision
- * by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL. If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
* --------------------------------------------------------------------
*
* Inquiries regarding the linux-wlan Open Source project can be
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
` (6 preceding siblings ...)
2023-05-12 10:06 ` [PATCH v2 07/10] drivers: staging: wlan-ng: Remove GPL/MPL boilerplate Bagas Sanjaya
@ 2023-05-12 10:06 ` Bagas Sanjaya
2023-05-12 12:46 ` Richard Fontana
` (3 more replies)
2023-05-12 10:06 ` [PATCH v2 09/10] udf: Replace " Bagas Sanjaya
` (2 subsequent siblings)
10 siblings, 4 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya, Ray Lehtiniemi,
Alessandro Zummo, Andrey Panin, Oleg Drokin, Marc Zyngier,
Jonas Jensen, Sylver Bruneau, Andrew Sharp, Denis Turischev,
Mika Westerberg, Alan Cox, Simon Horman
Many watchdog drivers's source files has already SPDX license
identifier, while some remaining doesn't.
Convert notices on remaining files to SPDX identifier. While at it,
also move SPDX identifier for drivers/watchdog/rtd119x_wdt.c to the
top of file (as in other files).
Cc: Ray Lehtiniemi <rayl@mail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Andrey Panin <pazke@donpac.ru>
Cc: Oleg Drokin <green@crimea.edu>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Jonas Jensen <jonas.jensen@gmail.com>
Cc: Sylver Bruneau <sylver.bruneau@googlemail.com>
Cc: Andrew Sharp <andy.sharp@lsi.com>
Cc: Denis Turischev <denis@compulab.co.il>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
drivers/watchdog/ep93xx_wdt.c | 5 +----
drivers/watchdog/ibmasr.c | 3 +--
drivers/watchdog/m54xx_wdt.c | 4 +---
drivers/watchdog/max63xx_wdt.c | 5 +----
drivers/watchdog/moxart_wdt.c | 4 +---
drivers/watchdog/octeon-wdt-nmi.S | 5 +----
drivers/watchdog/orion_wdt.c | 4 +---
drivers/watchdog/rtd119x_wdt.c | 2 +-
drivers/watchdog/sb_wdog.c | 5 +----
drivers/watchdog/sbc_fitpc2_wdt.c | 4 +---
drivers/watchdog/ts4800_wdt.c | 4 +---
drivers/watchdog/ts72xx_wdt.c | 4 +---
12 files changed, 12 insertions(+), 37 deletions(-)
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index 38e26f160b9a57..59dfd7f6bf0ba1 100644
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Watchdog driver for Cirrus Logic EP93xx family of devices.
*
@@ -11,10 +12,6 @@
* Copyright (c) 2012 H Hartley Sweeten <hsweeten@visionengravers.com>
* Convert to a platform device and use the watchdog framework API
*
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
* This watchdog fires after 250msec, which is a too short interval
* for us to rely on the user space daemon alone. So we ping the
* wdt each ~200msec and eventually stop doing it if the user space
diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
index 4a22fe15208630..6955c693b5fd00 100644
--- a/drivers/watchdog/ibmasr.c
+++ b/drivers/watchdog/ibmasr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* IBM Automatic Server Restart driver.
*
@@ -6,8 +7,6 @@
* Based on driver written by Pete Reynolds.
* Copyright (c) IBM Corporation, 1998-2004.
*
- * This software may be used and distributed according to the terms
- * of the GNU Public License, incorporated herein by reference.
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c
index f388a769dbd33d..062ea3e6497e52 100644
--- a/drivers/watchdog/m54xx_wdt.c
+++ b/drivers/watchdog/m54xx_wdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* drivers/watchdog/m54xx_wdt.c
*
@@ -11,9 +12,6 @@
* Copyright 2004 (c) MontaVista, Software, Inc.
* Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin <green@crimea.edu>
*
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c
index 9e1541cfae0d89..21935f9620e463 100644
--- a/drivers/watchdog/max63xx_wdt.c
+++ b/drivers/watchdog/max63xx_wdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* drivers/char/watchdog/max63xx_wdt.c
*
@@ -5,10 +6,6 @@
*
* Copyright (C) 2009 Marc Zyngier <maz@misterjones.org>
*
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
* This driver assumes the watchdog pins are memory mapped (as it is
* the case for the Arcom Zeus). Should it be connected over GPIOs or
* another interface, some abstraction will have to be introduced.
diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c
index 6340a1f5f471b2..b7b1da3c932ded 100644
--- a/drivers/watchdog/moxart_wdt.c
+++ b/drivers/watchdog/moxart_wdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* MOXA ART SoCs watchdog driver.
*
@@ -5,9 +6,6 @@
*
* Jonas Jensen <jonas.jensen@gmail.com>
*
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
*/
#include <linux/clk.h>
diff --git a/drivers/watchdog/octeon-wdt-nmi.S b/drivers/watchdog/octeon-wdt-nmi.S
index 97f6eb7b5a8e04..57bb0845de477d 100644
--- a/drivers/watchdog/octeon-wdt-nmi.S
+++ b/drivers/watchdog/octeon-wdt-nmi.S
@@ -1,8 +1,5 @@
+/* SPDX-License-Identifier: GPL-1.0+ */
/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
* Copyright (C) 2007-2017 Cavium, Inc.
*/
#include <asm/asm.h>
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 5ec2dd8fd5fa3d..1fe583e8a95b2e 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* drivers/watchdog/orion_wdt.c
*
@@ -5,9 +6,6 @@
*
* Author: Sylver Bruneau <sylver.bruneau@googlemail.com>
*
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c
index 95c8d7abce42e6..984905695dde51 100644
--- a/drivers/watchdog/rtd119x_wdt.c
+++ b/drivers/watchdog/rtd119x_wdt.c
@@ -1,9 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Realtek RTD129x watchdog
*
* Copyright (c) 2017 Andreas Färber
*
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <linux/bitops.h>
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index 504be461f992a9..822bf8905bf3ce 100644
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
/*
* Watchdog driver for SiByte SB1 SoCs
*
@@ -38,10 +39,6 @@
* (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
* All Rights Reserved.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 1 or 2 as published by the Free Software Foundation.
- *
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c
index 13db71e165836e..b8eb8d5ca1af0c 100644
--- a/drivers/watchdog/sbc_fitpc2_wdt.c
+++ b/drivers/watchdog/sbc_fitpc2_wdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Watchdog driver for SBC-FITPC2 board
*
@@ -5,9 +6,6 @@
*
* Adapted from the IXP2000 watchdog driver by Deepak Saxena.
*
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
*/
#define pr_fmt(fmt) KBUILD_MODNAME " WATCHDOG: " fmt
diff --git a/drivers/watchdog/ts4800_wdt.c b/drivers/watchdog/ts4800_wdt.c
index 0ea554c7cda579..0099403f49922f 100644
--- a/drivers/watchdog/ts4800_wdt.c
+++ b/drivers/watchdog/ts4800_wdt.c
@@ -1,11 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Watchdog driver for TS-4800 based boards
*
* Copyright (c) 2015 - Savoir-faire Linux
*
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
*/
#include <linux/kernel.h>
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index bf918f5fa13175..3d57670befe1ce 100644
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Watchdog driver for Technologic Systems TS-72xx based SBCs
* (TS-7200, TS-7250 and TS-7260). These boards have external
@@ -8,9 +9,6 @@
*
* This driver is based on ep93xx_wdt and wm831x_wdt drivers.
*
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
*/
#include <linux/platform_device.h>
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 09/10] udf: Replace license notice with SPDX identifier
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
` (7 preceding siblings ...)
2023-05-12 10:06 ` [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier Bagas Sanjaya
@ 2023-05-12 10:06 ` Bagas Sanjaya
2023-05-12 13:21 ` Richard Fontana
2023-05-13 9:48 ` Pali Rohár
2023-05-12 10:06 ` [PATCH v2 10/10] include: synclink: Replace GPL " Bagas Sanjaya
2023-05-12 11:23 ` [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Greg Kroah-Hartman
10 siblings, 2 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya, Pali Rohár,
Simon Horman
Except Kconfig and Makefile, all source files for UDF filesystem doesn't
bear SPDX license identifier. Add appropriate license identifier while
replacing boilerplates.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Pali Rohár <pali@kernel.org>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
tglx, in your patch attempt [1] you said that you'd figured out original
author names in UDF source files [2], but you had not already try to
contact them, right? I thought that they are pseudonyms if they couldn't
be contacted.
[1]: https://lore.kernel.org/all/20190604081206.123876666@linutronix.de/
[2]: https://lore.kernel.org/all/alpine.DEB.2.21.1906111604130.1662@nanos.tec.linutronix.de/
fs/udf/balloc.c | 6 +-----
fs/udf/dir.c | 6 +-----
fs/udf/directory.c | 6 +-----
fs/udf/ecma_167.h | 24 +-----------------------
fs/udf/file.c | 6 +-----
fs/udf/ialloc.c | 6 +-----
fs/udf/inode.c | 6 +-----
fs/udf/lowlevel.c | 6 +-----
fs/udf/misc.c | 6 +-----
fs/udf/namei.c | 6 +-----
fs/udf/osta_udf.h | 24 +-----------------------
fs/udf/partition.c | 6 +-----
fs/udf/super.c | 6 +-----
fs/udf/symlink.c | 6 +-----
fs/udf/truncate.c | 6 +-----
fs/udf/udftime.c | 19 +------------------
fs/udf/unicode.c | 6 +-----
17 files changed, 17 insertions(+), 134 deletions(-)
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 14b9db4c80f03f..ab3ffc355949dc 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* balloc.c
*
@@ -5,11 +6,6 @@
* Block allocation handling routines for the OSTA-UDF(tm) filesystem.
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1999-2001 Ben Fennema
* (C) 1999 Stelias Computing Inc
*
diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index 212393b12c2266..f6533f93851b95 100644
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* dir.c
*
@@ -5,11 +6,6 @@
* Directory handling routines for the OSTA-UDF(tm) filesystem.
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1998-2004 Ben Fennema
*
* HISTORY
diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index 654536d2b60976..1c775e072b2fef 100644
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -1,14 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* directory.c
*
* PURPOSE
* Directory related functions
*
- * COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
*/
#include "udfdecl.h"
diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h
index de17a97e866742..b2b5bca45758df 100644
--- a/fs/udf/ecma_167.h
+++ b/fs/udf/ecma_167.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause OR GPL-1.0+ */
/*
* ecma_167.h
*
@@ -8,29 +9,6 @@
* Copyright (c) 2017-2019 Pali Rohár <pali@kernel.org>
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification.
- * 2. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
*/
/**
diff --git a/fs/udf/file.c b/fs/udf/file.c
index 8238f742377bab..b871b85457e5bb 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* file.c
*
@@ -5,11 +6,6 @@
* File handling routines for the OSTA-UDF(tm) filesystem.
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1998-1999 Dave Boynton
* (C) 1998-2004 Ben Fennema
* (C) 1999-2000 Stelias Computing Inc
diff --git a/fs/udf/ialloc.c b/fs/udf/ialloc.c
index 8d50121778a57d..5f7ac8c8479873 100644
--- a/fs/udf/ialloc.c
+++ b/fs/udf/ialloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* ialloc.c
*
@@ -5,11 +6,6 @@
* Inode allocation handling routines for the OSTA-UDF(tm) filesystem.
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1998-2001 Ben Fennema
*
* HISTORY
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 1e71e04ae8f6b9..28cdfc57d946e3 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* inode.c
*
@@ -5,11 +6,6 @@
* Inode handling routines for the OSTA-UDF(tm) filesystem.
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1998 Dave Boynton
* (C) 1998-2004 Ben Fennema
* (C) 1999-2000 Stelias Computing Inc
diff --git a/fs/udf/lowlevel.c b/fs/udf/lowlevel.c
index c87ed942d07653..9d847a7a0905dd 100644
--- a/fs/udf/lowlevel.c
+++ b/fs/udf/lowlevel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* lowlevel.c
*
@@ -5,11 +6,6 @@
* Low Level Device Routines for the UDF filesystem
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1999-2001 Ben Fennema
*
* HISTORY
diff --git a/fs/udf/misc.c b/fs/udf/misc.c
index 3777468d06ce58..0788593b6a1d8b 100644
--- a/fs/udf/misc.c
+++ b/fs/udf/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* misc.c
*
@@ -5,11 +6,6 @@
* Miscellaneous routines for the OSTA-UDF(tm) filesystem.
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1998 Dave Boynton
* (C) 1998-2004 Ben Fennema
* (C) 1999-2000 Stelias Computing Inc
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index fd20423d3ed24c..49e1e0fe3feeb2 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* namei.c
*
@@ -5,11 +6,6 @@
* Inode name handling routines for the OSTA-UDF(tm) filesystem.
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1998-2004 Ben Fennema
* (C) 1999-2000 Stelias Computing Inc
*
diff --git a/fs/udf/osta_udf.h b/fs/udf/osta_udf.h
index 157de0ec0cd530..6c09a4cb46f4a7 100644
--- a/fs/udf/osta_udf.h
+++ b/fs/udf/osta_udf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause OR GPL-1.0+ */
/*
* osta_udf.h
*
@@ -8,29 +9,6 @@
* Copyright (c) 2017-2019 Pali Rohár <pali@kernel.org>
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions, and the following disclaimer,
- * without modification.
- * 2. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
*/
/**
diff --git a/fs/udf/partition.c b/fs/udf/partition.c
index 5bcfe78d5cabe9..af877991edc13a 100644
--- a/fs/udf/partition.c
+++ b/fs/udf/partition.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* partition.c
*
@@ -5,11 +6,6 @@
* Partition handling routines for the OSTA-UDF(tm) filesystem.
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1998-2001 Ben Fennema
*
* HISTORY
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 6304e3c5c3d969..928a04d9d9e0ad 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* super.c
*
@@ -15,11 +16,6 @@
* https://www.iso.org/
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1998 Dave Boynton
* (C) 1998-2004 Ben Fennema
* (C) 2000 Stelias Computing Inc
diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
index a34c8c4e6d2109..779b5c2c75f61e 100644
--- a/fs/udf/symlink.c
+++ b/fs/udf/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* symlink.c
*
@@ -5,11 +6,6 @@
* Symlink handling routines for the OSTA-UDF(tm) filesystem.
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1998-2001 Ben Fennema
* (C) 1999 Stelias Computing Inc
*
diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c
index 2e7ba234bab8b8..a686c10fd709d1 100644
--- a/fs/udf/truncate.c
+++ b/fs/udf/truncate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* truncate.c
*
@@ -5,11 +6,6 @@
* Truncate handling routines for the OSTA-UDF(tm) filesystem.
*
* COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
- *
* (C) 1999-2004 Ben Fennema
* (C) 1999 Stelias Computing Inc
*
diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
index fce4ad976c8c29..d0fce5348fd3f3 100644
--- a/fs/udf/udftime.c
+++ b/fs/udf/udftime.c
@@ -1,21 +1,4 @@
-/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Paul Eggert (eggert@twinsun.com).
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+// SPDX-License-Identifier: GPL-2.0-only
/*
* dgb 10/02/98: ripped this from glibc source to help convert timestamps
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
index 622569007b530b..ae6e809fa3aac7 100644
--- a/fs/udf/unicode.c
+++ b/fs/udf/unicode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* unicode.c
*
@@ -11,11 +12,6 @@
* UTF-8 is explained in the IETF RFC XXXX.
* ftp://ftp.internic.net/rfc/rfcxxxx.txt
*
- * COPYRIGHT
- * This file is distributed under the terms of the GNU General Public
- * License (GPL). Copies of the GPL can be obtained from:
- * ftp://prep.ai.mit.edu/pub/gnu/GPL
- * Each contributing author retains all rights to their own work.
*/
#include "udfdecl.h"
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v2 10/10] include: synclink: Replace GPL license notice with SPDX identifier
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
` (8 preceding siblings ...)
2023-05-12 10:06 ` [PATCH v2 09/10] udf: Replace " Bagas Sanjaya
@ 2023-05-12 10:06 ` Bagas Sanjaya
2023-05-12 11:23 ` [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Greg Kroah-Hartman
10 siblings, 0 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 10:06 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Bagas Sanjaya, Simon Horman
Replace unversioned GPL license notice with appropriate SPDX
identifier, which is GPL 1.0+.
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
include/linux/synclink.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/synclink.h b/include/linux/synclink.h
index f1405b1c71ba15..85195634c81dfa 100644
--- a/include/linux/synclink.h
+++ b/include/linux/synclink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ */
/*
* SyncLink Multiprotocol Serial Adapter Driver
*
@@ -5,8 +6,6 @@
*
* Copyright (C) 1998-2000 by Microgate Corporation
*
- * Redistribution of this file is permitted under
- * the terms of the GNU Public License (GPL)
*/
#ifndef _SYNCLINK_H_
#define _SYNCLINK_H_
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH v2 05/10] net: ethernet: i825xx: Replace GPL boilerplate with SPDX identifier
2023-05-12 10:06 ` [PATCH v2 05/10] net: ethernet: i825xx: " Bagas Sanjaya
@ 2023-05-12 11:21 ` Greg Kroah-Hartman
0 siblings, 0 replies; 28+ messages in thread
From: Greg Kroah-Hartman @ 2023-05-12 11:21 UTC (permalink / raw)
To: Bagas Sanjaya
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Wim Van Sebroeck,
Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Donald Becker, Michael Hipp,
Richard Hirst, Simon Horman
On Fri, May 12, 2023 at 05:06:16PM +0700, Bagas Sanjaya wrote:
> Replace unversioned GPL boilerplate notice on remaining i825xx files
> with appropriate SPDX identifier. For files that contains "extension to
> Linux kernel", use GPL 2.0, otherwise GPL 1.0+.
>
> Cc: Donald Becker <becker@scyld.com>
> Cc: Michael Hipp <hippm@informatik.uni-tuebingen.de>
> Cc: Richard Hirst <richard@sleepie.demon.co.uk>
> Cc: Sam Creasey <sammy@sammy.net>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
> ---
> drivers/net/ethernet/i825xx/82596.c | 5 ++---
> drivers/net/ethernet/i825xx/lasi_82596.c | 5 ++---
> drivers/net/ethernet/i825xx/lib82596.c | 5 ++---
> drivers/net/ethernet/i825xx/sun3_82586.c | 4 +---
> drivers/net/ethernet/i825xx/sun3_82586.h | 4 +---
> 5 files changed, 8 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/ethernet/i825xx/82596.c b/drivers/net/ethernet/i825xx/82596.c
> index 3ee89ae496d0ca..773d7aa29ef5fc 100644
> --- a/drivers/net/ethernet/i825xx/82596.c
> +++ b/drivers/net/ethernet/i825xx/82596.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-1.0+
> /* 82596.c: A generic 82596 ethernet driver for linux. */
> /*
> Based on Apricot.c
> @@ -31,9 +32,7 @@
> Driver skeleton
> Written 1993 by Donald Becker.
> Copyright 1993 United States Government as represented by the Director,
> - National Security Agency. This software may only be used and distributed
> - according to the terms of the GNU General Public License as modified by SRC,
> - incorporated herein by reference.
> + National Security Agency.
>
> The author may be reached as becker@scyld.com, or C/O
> Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403
> diff --git a/drivers/net/ethernet/i825xx/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c
> index 0af70094aba341..3e53e0c243ba04 100644
> --- a/drivers/net/ethernet/i825xx/lasi_82596.c
> +++ b/drivers/net/ethernet/i825xx/lasi_82596.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-1.0+
> /* lasi_82596.c -- driver for the intel 82596 ethernet controller, as
> munged into HPPA boxen .
>
> @@ -59,9 +60,7 @@
> Driver skeleton
> Written 1993 by Donald Becker.
> Copyright 1993 United States Government as represented by the Director,
> - National Security Agency. This software may only be used and distributed
> - according to the terms of the GNU General Public License as modified by SRC,
> - incorporated herein by reference.
> + National Security Agency.
>
> The author may be reached as becker@scyld.com, or C/O
> Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403
> diff --git a/drivers/net/ethernet/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c
> index ca2fb303fcc6f6..67d248a7a6f49e 100644
> --- a/drivers/net/ethernet/i825xx/lib82596.c
> +++ b/drivers/net/ethernet/i825xx/lib82596.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-1.0+
> /* lasi_82596.c -- driver for the intel 82596 ethernet controller, as
> munged into HPPA boxen .
>
> @@ -59,9 +60,7 @@
> Driver skeleton
> Written 1993 by Donald Becker.
> Copyright 1993 United States Government as represented by the Director,
> - National Security Agency. This software may only be used and distributed
> - according to the terms of the GNU General Public License as modified by SRC,
> - incorporated herein by reference.
> + National Security Agency.
>
> The author may be reached as becker@scyld.com, or C/O
> Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403
> diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
> index 3909c6a0af89f9..f05f016cb3b0ea 100644
> --- a/drivers/net/ethernet/i825xx/sun3_82586.c
> +++ b/drivers/net/ethernet/i825xx/sun3_82586.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-only
As you are mixing GPL-1.0 and GPL-2.0 conversions in the same patch, you
need to break this up and provide the justification for why you choose
the specific license for each one, as you can't just lump them all
together and expect us to understand the reasoning when you didn't
provide any.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes)
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
` (9 preceding siblings ...)
2023-05-12 10:06 ` [PATCH v2 10/10] include: synclink: Replace GPL " Bagas Sanjaya
@ 2023-05-12 11:23 ` Greg Kroah-Hartman
2023-05-13 9:25 ` Bagas Sanjaya
10 siblings, 1 reply; 28+ messages in thread
From: Greg Kroah-Hartman @ 2023-05-12 11:23 UTC (permalink / raw)
To: Bagas Sanjaya
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Wim Van Sebroeck,
Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam
On Fri, May 12, 2023 at 05:06:11PM +0700, Bagas Sanjaya wrote:
> I trigger this patch series as a response to Didi's GPL full name fix
> patches [1], for which all of them had been NAKed. In many cases, the
> appropriate correction is to use SPDX license identifier instead.
>
> Often, when replacing license notice boilerplates with their equivalent
> SPDX identifier, the notice doesn't mention explicit GPL version. Greg
> [2] replied this question by falling back to GPL 1.0 (more precisely
> GPL 1.0+ in order to be compatible with GPL 2.0 used by Linux kernel),
> although there are exceptions (mostly resolved by inferring from
> older patches covering similar situation).
>
> The series covers the same directories touched as Didi's ones, minus
> Documentation/ (as should have been inferred by SPDX tags on respective
> docs).
>
I'm glad to take these types of changes through the SPDX tree, but
please break them up into smaller changes that show the justification
for each type of change in each subsystem, so that we can evaluate them
on an individual basis. As you did here, you are lumping things
together only by the existance of the file in the tree, not by the
logical type of change happening, which isn't ok.
Also, you can send them as subsystem-specific series, so as to not have
to cross-post all of the changes all over the place. I doubt the drm
developers care about ethernet driver license issues :)
thanks,
greg k-h
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier
2023-05-12 10:06 ` [PATCH v2 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier Bagas Sanjaya
@ 2023-05-12 11:27 ` Geert Uytterhoeven
2023-05-12 13:03 ` Richard Fontana
1 sibling, 0 replies; 28+ messages in thread
From: Geert Uytterhoeven @ 2023-05-12 11:27 UTC (permalink / raw)
To: Bagas Sanjaya
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, David A . Hinds, Donald Becker,
Peter De Schrijver, Topi Kanerva, Alain Malek, Bruce Abbott,
Alan Cox, Greg Ungerer, Simon Horman
Hi Bagas,
On Fri, May 12, 2023 at 12:08 PM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
> Replace GPL boilerplate notice on remaining files with appropriate SPDX
> tag. For files mentioning COPYING, use GPL 2.0; otherwise GPL 1.0+.
>
> Cc: David A. Hinds <dahinds@users.sourceforge.net>
> Cc: Donald Becker <becker@scyld.com>
> Cc: Peter De Schrijver <p2@mind.be>
> Cc: Topi Kanerva <topi@susanna.oulu.fi>
> Cc: Alain Malek <Alain.Malek@cryogen.com>
> Cc: Bruce Abbott <bhabbott@inhb.co.nz>
> Cc: Alan Cox <alan@linux.intel.com>
> Acked-by: Greg Ungerer <gerg@linux-m68k.org>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
Thanks for your patch!
> --- a/drivers/net/ethernet/8390/apne.c
> +++ b/drivers/net/ethernet/8390/apne.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-1.0+
As per the removed lines below, this should be GPL-2.0-only.
> /*
> * Amiga Linux/68k 8390 based PCMCIA Ethernet Driver for the Amiga 1200
> *
> @@ -19,12 +20,6 @@
> *
> * ----------------------------------------------------------------------------
> *
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License. See the file COPYING in the main directory of the Linux
> - * distribution for more details.
> - *
> - * ----------------------------------------------------------------------------
> - *
> */
>
>
> --- a/drivers/net/ethernet/8390/hydra.c
> +++ b/drivers/net/ethernet/8390/hydra.c
> @@ -1,10 +1,8 @@
> +// SPDX-License-Identifier: GPL-1.0+
Likewise.
> +
> /* New Hydra driver using generic 8390 core */
> /* Based on old hydra driver by Topi Kanerva (topi@susanna.oulu.fi) */
>
> -/* This file is subject to the terms and conditions of the GNU General */
> -/* Public License. See the file COPYING in the main directory of the */
> -/* Linux distribution for more details. */
> -
> /* Peter De Schrijver (p2@mind.be) */
> /* Oldenburg 2000 */
>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier
2023-05-12 10:06 ` [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier Bagas Sanjaya
@ 2023-05-12 12:46 ` Richard Fontana
2023-05-13 10:52 ` Bagas Sanjaya
2023-05-12 12:49 ` Guenter Roeck
` (2 subsequent siblings)
3 siblings, 1 reply; 28+ messages in thread
From: Richard Fontana @ 2023-05-12 12:46 UTC (permalink / raw)
To: Bagas Sanjaya
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Ray Lehtiniemi, Alessandro Zummo,
Andrey Panin, Oleg Drokin, Marc Zyngier, Jonas Jensen,
Sylver Bruneau, Andrew Sharp, Denis Turischev, Mika Westerberg,
Alan Cox, Simon Horman
On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
> index 504be461f992a9..822bf8905bf3ce 100644
> --- a/drivers/watchdog/sb_wdog.c
> +++ b/drivers/watchdog/sb_wdog.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-1.0+
> /*
> * Watchdog driver for SiByte SB1 SoCs
> *
> @@ -38,10 +39,6 @@
> * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
> * All Rights Reserved.
> *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License
> - * version 1 or 2 as published by the Free Software Foundation.
Shouldn't this be
// SPDX-License-Identifier: GPL-1.0 OR GPL-2.0
(or in current SPDX notation GPL-1.0-only OR GPL-2.0-only) ?
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier
2023-05-12 10:06 ` [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier Bagas Sanjaya
2023-05-12 12:46 ` Richard Fontana
@ 2023-05-12 12:49 ` Guenter Roeck
2023-05-12 12:50 ` Bagas Sanjaya
2023-05-12 13:14 ` Andreas Färber
3 siblings, 0 replies; 28+ messages in thread
From: Guenter Roeck @ 2023-05-12 12:49 UTC (permalink / raw)
To: Bagas Sanjaya
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Ray Lehtiniemi, Alessandro Zummo,
Andrey Panin, Oleg Drokin, Marc Zyngier, Jonas Jensen,
Sylver Bruneau, Andrew Sharp, Denis Turischev, Mika Westerberg,
Alan Cox, Simon Horman
On Fri, May 12, 2023 at 05:06:19PM +0700, Bagas Sanjaya wrote:
> Many watchdog drivers's source files has already SPDX license
> identifier, while some remaining doesn't.
>
> Convert notices on remaining files to SPDX identifier. While at it,
> also move SPDX identifier for drivers/watchdog/rtd119x_wdt.c to the
> top of file (as in other files).
>
> Cc: Ray Lehtiniemi <rayl@mail.com>
> Cc: Alessandro Zummo <a.zummo@towertech.it>
> Cc: Andrey Panin <pazke@donpac.ru>
> Cc: Oleg Drokin <green@crimea.edu>
> Cc: Marc Zyngier <maz@kernel.org>
> Cc: Jonas Jensen <jonas.jensen@gmail.com>
> Cc: Sylver Bruneau <sylver.bruneau@googlemail.com>
> Cc: Andrew Sharp <andy.sharp@lsi.com>
> Cc: Denis Turischev <denis@compulab.co.il>
> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
> Cc: Alan Cox <alan@linux.intel.com>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
> ---
> drivers/watchdog/ep93xx_wdt.c | 5 +----
> drivers/watchdog/ibmasr.c | 3 +--
> drivers/watchdog/m54xx_wdt.c | 4 +---
> drivers/watchdog/max63xx_wdt.c | 5 +----
> drivers/watchdog/moxart_wdt.c | 4 +---
> drivers/watchdog/octeon-wdt-nmi.S | 5 +----
> drivers/watchdog/orion_wdt.c | 4 +---
> drivers/watchdog/rtd119x_wdt.c | 2 +-
> drivers/watchdog/sb_wdog.c | 5 +----
> drivers/watchdog/sbc_fitpc2_wdt.c | 4 +---
> drivers/watchdog/ts4800_wdt.c | 4 +---
> drivers/watchdog/ts72xx_wdt.c | 4 +---
> 12 files changed, 12 insertions(+), 37 deletions(-)
>
[ ... ]
> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
> index 504be461f992a9..822bf8905bf3ce 100644
> --- a/drivers/watchdog/sb_wdog.c
> +++ b/drivers/watchdog/sb_wdog.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-1.0+
This would include GPL 3, but the text below explicitly excludes that.
No idea how to handle that.
Guenter
> /*
> * Watchdog driver for SiByte SB1 SoCs
> *
> @@ -38,10 +39,6 @@
> * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
> * All Rights Reserved.
> *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License
> - * version 1 or 2 as published by the Free Software Foundation.
> - *
> */
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier
2023-05-12 10:06 ` [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier Bagas Sanjaya
2023-05-12 12:46 ` Richard Fontana
2023-05-12 12:49 ` Guenter Roeck
@ 2023-05-12 12:50 ` Bagas Sanjaya
2023-05-12 13:14 ` Andreas Färber
3 siblings, 0 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-12 12:50 UTC (permalink / raw)
To: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Ray Lehtiniemi, Alessandro Zummo,
Andrey Panin, Oleg Drokin, Marc Zyngier, Jonas Jensen,
Sylver Bruneau, Andrew Sharp, Denis Turischev, Mika Westerberg,
Alan Cox, Simon Horman
On 5/12/23 17:06, Bagas Sanjaya wrote:
> diff --git a/drivers/watchdog/octeon-wdt-nmi.S b/drivers/watchdog/octeon-wdt-nmi.S
> index 97f6eb7b5a8e04..57bb0845de477d 100644
> --- a/drivers/watchdog/octeon-wdt-nmi.S
> +++ b/drivers/watchdog/octeon-wdt-nmi.S
> @@ -1,8 +1,5 @@
> +/* SPDX-License-Identifier: GPL-1.0+ */
> /*
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License. See the file "COPYING" in the main directory of this archive
> - * for more details.
> - *
Oops, still incorrect tag. Will fix in v3 (should be out on next Monday).
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier
2023-05-12 10:06 ` [PATCH v2 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier Bagas Sanjaya
2023-05-12 11:27 ` Geert Uytterhoeven
@ 2023-05-12 13:03 ` Richard Fontana
1 sibling, 0 replies; 28+ messages in thread
From: Richard Fontana @ 2023-05-12 13:03 UTC (permalink / raw)
To: Bagas Sanjaya
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, David A . Hinds, Donald Becker,
Peter De Schrijver, Topi Kanerva, Alain Malek, Bruce Abbott,
Alan Cox, Greg Ungerer, Simon Horman
On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
>
> Replace GPL boilerplate notice on remaining files with appropriate SPDX
> tag. For files mentioning COPYING, use GPL 2.0; otherwise GPL 1.0+.
> diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
> index 6a0a2039600a0a..ea3488e81c5f3c 100644
> --- a/drivers/net/ethernet/8390/ne2k-pci.c
> +++ b/drivers/net/ethernet/8390/ne2k-pci.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-1.0+
> /* A Linux device driver for PCI NE2000 clones.
> *
> * Authors and other copyright holders:
> @@ -6,13 +7,6 @@
> * Copyright 1993 assigned to the United States Government as represented
> * by the Director, National Security Agency.
> *
> - * This software may be used and distributed according to the terms of
> - * the GNU General Public License (GPL), incorporated herein by reference.
> - * Drivers based on or derived from this code fall under the GPL and must
> - * retain the authorship, copyright and license notice. This file is not
> - * a complete program and may only be used when the entire operating
> - * system is licensed under the GPL.
I don't think you should delete those last two sentences.
"Drivers based on or derived from this code fall under the GPL and must
retain the authorship, copyright and license notice."
The notice has:
* Authors and other copyright holders:
* 1992-2000 by Donald Becker, NE2000 core and various modifications.
* 1995-1998 by Paul Gortmaker, core modifications and PCI support.
* Copyright 1993 assigned to the United States Government as represented
* by the Director, National Security Agency.
Nothing in the GPL requires retention of "authorship", as some other
licenses do (you can argue that GPLv2 conflates authorship with
copyright ownership, but this sentence seems to distinguish
"authorship" from "copyright" as does the listing of authors). There
is (arguably) a tradition of treating extra author attribution
requirements as legitimate, but if you view them as extra requirements
you can't, or shouldn't, just remove them arbitrarily.
Then there's this:
"This file is not a complete program and may only be used when the
entire operating system is licensed under the GPL."
Whether or not that's a correct statement of GPL interpretation
(perhaps it depends on the meaning of "entire operating system"), it's
significant enough as a nonstandard interpretive comment that I think
you should probably not remove it.
Richard
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier
2023-05-12 10:06 ` [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier Bagas Sanjaya
` (2 preceding siblings ...)
2023-05-12 12:50 ` Bagas Sanjaya
@ 2023-05-12 13:14 ` Andreas Färber
3 siblings, 0 replies; 28+ messages in thread
From: Andreas Färber @ 2023-05-12 13:14 UTC (permalink / raw)
To: Bagas Sanjaya, Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions
Cc: Diederik de Haas, Kate Stewart, Philippe Ombredanne,
Thomas Gleixner, David Airlie, Karsten Keil, Jay Vosburgh,
Andy Gospodarek, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Sam Creasey, Dominik Brodowski, Daniel Mack,
Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Manivannan Sadhasivam,
Ray Lehtiniemi, Alessandro Zummo, Andrey Panin, Oleg Drokin,
Marc Zyngier, Jonas Jensen, Sylver Bruneau, Andrew Sharp,
Denis Turischev, Mika Westerberg, Alan Cox, Simon Horman
Hi,
Am 12.05.23 um 12:06 schrieb Bagas Sanjaya:
> Many watchdog drivers's source files has already SPDX license
> identifier, while some remaining doesn't.
>
> Convert notices on remaining files to SPDX identifier. While at it,
> also move SPDX identifier for drivers/watchdog/rtd119x_wdt.c to the
> top of file (as in other files).
>
> Cc: Ray Lehtiniemi <rayl@mail.com>
> Cc: Alessandro Zummo <a.zummo@towertech.it>
> Cc: Andrey Panin <pazke@donpac.ru>
> Cc: Oleg Drokin <green@crimea.edu>
> Cc: Marc Zyngier <maz@kernel.org>
> Cc: Jonas Jensen <jonas.jensen@gmail.com>
> Cc: Sylver Bruneau <sylver.bruneau@googlemail.com>
> Cc: Andrew Sharp <andy.sharp@lsi.com>
> Cc: Denis Turischev <denis@compulab.co.il>
> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
> Cc: Alan Cox <alan@linux.intel.com>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
> ---
[...]
> diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c
> index 95c8d7abce42e6..984905695dde51 100644
> --- a/drivers/watchdog/rtd119x_wdt.c
> +++ b/drivers/watchdog/rtd119x_wdt.c
> @@ -1,9 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> * Realtek RTD129x watchdog
> *
> * Copyright (c) 2017 Andreas Färber
> *
> - * SPDX-License-Identifier: GPL-2.0+
> */
>
> #include <linux/bitops.h>
Acked-by: Andreas Färber <afaerber@suse.de> # for RTD119x
Thanks,
Andreas
--
SUSE Software Solutions Germany GmbH
Frankenstraße 146, 90461 Nürnberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nürnberg)
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 09/10] udf: Replace license notice with SPDX identifier
2023-05-12 10:06 ` [PATCH v2 09/10] udf: Replace " Bagas Sanjaya
@ 2023-05-12 13:21 ` Richard Fontana
2023-05-13 9:31 ` Bagas Sanjaya
2023-05-13 9:48 ` Pali Rohár
1 sibling, 1 reply; 28+ messages in thread
From: Richard Fontana @ 2023-05-12 13:21 UTC (permalink / raw)
To: Bagas Sanjaya
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Pali Rohár, Simon Horman
On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
> diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h
> index de17a97e866742..b2b5bca45758df 100644
> --- a/fs/udf/ecma_167.h
> +++ b/fs/udf/ecma_167.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: BSD-2-Clause OR GPL-1.0+ */
> /*
> * ecma_167.h
> *
> @@ -8,29 +9,6 @@
> * Copyright (c) 2017-2019 Pali Rohár <pali@kernel.org>
> * All rights reserved.
> *
> - * Redistribution and use in source and binary forms, with or without
> - * modification, are permitted provided that the following conditions
> - * are met:
> - * 1. Redistributions of source code must retain the above copyright
> - * notice, this list of conditions, and the following disclaimer,
> - * without modification.
> - * 2. The name of the author may not be used to endorse or promote products
> - * derived from this software without specific prior written permission.
> - *
> - * Alternatively, this software may be distributed under the terms of the
> - * GNU Public License ("GPL").
> - *
> - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
> - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
> - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> - * SUCH DAMAGE.
> */
This is not BSD-2-Clause. Ignoring the interior statement about the
GPL, I think the closest SPDX identifier might be
https://spdx.org/licenses/BSD-Source-Code.html
but it doesn't quite match.
> diff --git a/fs/udf/osta_udf.h b/fs/udf/osta_udf.h
> index 157de0ec0cd530..6c09a4cb46f4a7 100644
> --- a/fs/udf/osta_udf.h
> +++ b/fs/udf/osta_udf.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: BSD-2-Clause OR GPL-1.0+ */
> /*
> * osta_udf.h
> *
> @@ -8,29 +9,6 @@
> * Copyright (c) 2017-2019 Pali Rohár <pali@kernel.org>
> * All rights reserved.
> *
> - * Redistribution and use in source and binary forms, with or without
> - * modification, are permitted provided that the following conditions
> - * are met:
> - * 1. Redistributions of source code must retain the above copyright
> - * notice, this list of conditions, and the following disclaimer,
> - * without modification.
> - * 2. The name of the author may not be used to endorse or promote products
> - * derived from this software without specific prior written permission.
> - *
> - * Alternatively, this software may be distributed under the terms of the
> - * GNU Public License ("GPL").
> - *
> - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
> - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
> - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> - * SUCH DAMAGE.
> */
Same comment - this is not BSD-2-Clause.
> diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
> index fce4ad976c8c29..d0fce5348fd3f3 100644
> --- a/fs/udf/udftime.c
> +++ b/fs/udf/udftime.c
> @@ -1,21 +1,4 @@
> -/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Paul Eggert (eggert@twinsun.com).
> -
> - The GNU C Library is free software; you can redistribute it and/or
> - modify it under the terms of the GNU Library General Public License as
> - published by the Free Software Foundation; either version 2 of the
> - License, or (at your option) any later version.
> -
> - The GNU C Library 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
> - Library General Public License for more details.
> -
> - You should have received a copy of the GNU Library General Public
> - License along with the GNU C Library; see the file COPYING.LIB. If not,
> - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
> - Boston, MA 02111-1307, USA. */
> +// SPDX-License-Identifier: GPL-2.0-only
Shouldn't this be
// SPDX-License-Identifier: LGPL-2.0-or-later ?
(or are you implicitly using the obscure LGPLv2.x section ... 3 mechanism?)
Richard
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes)
2023-05-12 11:23 ` [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Greg Kroah-Hartman
@ 2023-05-13 9:25 ` Bagas Sanjaya
0 siblings, 0 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-13 9:25 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Wim Van Sebroeck,
Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam
On 5/12/23 18:23, Greg Kroah-Hartman wrote:
> I'm glad to take these types of changes through the SPDX tree, but
> please break them up into smaller changes that show the justification
> for each type of change in each subsystem, so that we can evaluate them
> on an individual basis. As you did here, you are lumping things
> together only by the existance of the file in the tree, not by the
> logical type of change happening, which isn't ok.
>
> Also, you can send them as subsystem-specific series, so as to not have
> to cross-post all of the changes all over the place. I doubt the drm
> developers care about ethernet driver license issues :)
>
OK, thanks!
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 09/10] udf: Replace license notice with SPDX identifier
2023-05-12 13:21 ` Richard Fontana
@ 2023-05-13 9:31 ` Bagas Sanjaya
0 siblings, 0 replies; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-13 9:31 UTC (permalink / raw)
To: Richard Fontana
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Pali Rohár, Simon Horman
On 5/12/23 20:21, Richard Fontana wrote:
> On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
>
>> diff --git a/fs/udf/ecma_167.h b/fs/udf/ecma_167.h
>> index de17a97e866742..b2b5bca45758df 100644
>> --- a/fs/udf/ecma_167.h
>> +++ b/fs/udf/ecma_167.h
>> @@ -1,3 +1,4 @@
>> +/* SPDX-License-Identifier: BSD-2-Clause OR GPL-1.0+ */
>> /*
>> * ecma_167.h
>> *
>> @@ -8,29 +9,6 @@
>> * Copyright (c) 2017-2019 Pali Rohár <pali@kernel.org>
>> * All rights reserved.
>> *
>> - * Redistribution and use in source and binary forms, with or without
>> - * modification, are permitted provided that the following conditions
>> - * are met:
>> - * 1. Redistributions of source code must retain the above copyright
>> - * notice, this list of conditions, and the following disclaimer,
>> - * without modification.
>> - * 2. The name of the author may not be used to endorse or promote products
>> - * derived from this software without specific prior written permission.
>> - *
>
> This is not BSD-2-Clause. Ignoring the interior statement about the
> GPL, I think the closest SPDX identifier might be
> https://spdx.org/licenses/BSD-Source-Code.html
> but it doesn't quite match.
>
BSD-2-Clause but the second clause is the third one on BSD-3-Clause.
Weird...
>> diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
>> index fce4ad976c8c29..d0fce5348fd3f3 100644
>> --- a/fs/udf/udftime.c
>> +++ b/fs/udf/udftime.c
>> @@ -1,21 +1,4 @@
>> -/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
>> - This file is part of the GNU C Library.
>> - Contributed by Paul Eggert (eggert@twinsun.com).
>> -
>> - The GNU C Library is free software; you can redistribute it and/or
>> - modify it under the terms of the GNU Library General Public License as
>> - published by the Free Software Foundation; either version 2 of the
>> - License, or (at your option) any later version.
>> -
>> - The GNU C Library 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
>> - Library General Public License for more details.
>> -
>> - You should have received a copy of the GNU Library General Public
>> - License along with the GNU C Library; see the file COPYING.LIB. If not,
>> - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
>> - Boston, MA 02111-1307, USA. */
>> +// SPDX-License-Identifier: GPL-2.0-only
>
> Shouldn't this be
> // SPDX-License-Identifier: LGPL-2.0-or-later ?
> (or are you implicitly using the obscure LGPLv2.x section ... 3 mechanism?)
>
That's right. I missed the exact notice above when I submitted this
series.
Thanks.
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 09/10] udf: Replace license notice with SPDX identifier
2023-05-12 10:06 ` [PATCH v2 09/10] udf: Replace " Bagas Sanjaya
2023-05-12 13:21 ` Richard Fontana
@ 2023-05-13 9:48 ` Pali Rohár
2023-05-13 9:59 ` Greg Kroah-Hartman
1 sibling, 1 reply; 28+ messages in thread
From: Pali Rohár @ 2023-05-13 9:48 UTC (permalink / raw)
To: Bagas Sanjaya
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Simon Horman
On Friday 12 May 2023 17:06:20 Bagas Sanjaya wrote:
> diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
> index fce4ad976c8c29..d0fce5348fd3f3 100644
> --- a/fs/udf/udftime.c
> +++ b/fs/udf/udftime.c
> @@ -1,21 +1,4 @@
> -/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Paul Eggert (eggert@twinsun.com).
> -
> - The GNU C Library is free software; you can redistribute it and/or
> - modify it under the terms of the GNU Library General Public License as
> - published by the Free Software Foundation; either version 2 of the
> - License, or (at your option) any later version.
> -
> - The GNU C Library 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
> - Library General Public License for more details.
> -
> - You should have received a copy of the GNU Library General Public
> - License along with the GNU C Library; see the file COPYING.LIB. If not,
> - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
> - Boston, MA 02111-1307, USA. */
> +// SPDX-License-Identifier: GPL-2.0-only
>
> /*
> * dgb 10/02/98: ripped this from glibc source to help convert timestamps
Please, dot not do this. It is really rude to people who worked on it in
past (even if they do not care about this particular file anymore) as
technically they still have ownership of this code / file. And such
change never remove their ownership or copyright in most countries.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 09/10] udf: Replace license notice with SPDX identifier
2023-05-13 9:48 ` Pali Rohár
@ 2023-05-13 9:59 ` Greg Kroah-Hartman
0 siblings, 0 replies; 28+ messages in thread
From: Greg Kroah-Hartman @ 2023-05-13 9:59 UTC (permalink / raw)
To: Pali Rohár, Bagas Sanjaya
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Wim Van Sebroeck,
Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Simon Horman
On Sat, May 13, 2023 at 11:48:51AM +0200, Pali Rohár wrote:
> On Friday 12 May 2023 17:06:20 Bagas Sanjaya wrote:
> > diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
> > index fce4ad976c8c29..d0fce5348fd3f3 100644
> > --- a/fs/udf/udftime.c
> > +++ b/fs/udf/udftime.c
> > @@ -1,21 +1,4 @@
> > -/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
> > - This file is part of the GNU C Library.
> > - Contributed by Paul Eggert (eggert@twinsun.com).
> > -
> > - The GNU C Library is free software; you can redistribute it and/or
> > - modify it under the terms of the GNU Library General Public License as
> > - published by the Free Software Foundation; either version 2 of the
> > - License, or (at your option) any later version.
> > -
> > - The GNU C Library 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
> > - Library General Public License for more details.
> > -
> > - You should have received a copy of the GNU Library General Public
> > - License along with the GNU C Library; see the file COPYING.LIB. If not,
> > - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
> > - Boston, MA 02111-1307, USA. */
> > +// SPDX-License-Identifier: GPL-2.0-only
> >
> > /*
> > * dgb 10/02/98: ripped this from glibc source to help convert timestamps
>
> Please, dot not do this. It is really rude to people who worked on it in
> past (even if they do not care about this particular file anymore) as
> technically they still have ownership of this code / file. And such
> change never remove their ownership or copyright in most countries.
>
Yes, copyright lines should never be removed.
Bagas, I recommend taking the Linux Foundation "copyright and licensing"
online course before you respin this series. It's free online and might
help you in understanding some of the issues involved here and prevent
you from making these types of mistakes in the future.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier
2023-05-12 12:46 ` Richard Fontana
@ 2023-05-13 10:52 ` Bagas Sanjaya
2023-05-13 13:43 ` Richard Fontana
0 siblings, 1 reply; 28+ messages in thread
From: Bagas Sanjaya @ 2023-05-13 10:52 UTC (permalink / raw)
To: Richard Fontana
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Ray Lehtiniemi, Alessandro Zummo,
Andrey Panin, Oleg Drokin, Marc Zyngier, Jonas Jensen,
Sylver Bruneau, Andrew Sharp, Denis Turischev, Mika Westerberg,
Alan Cox, Simon Horman
On 5/12/23 19:46, Richard Fontana wrote:
> On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
>
>
>> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
>> index 504be461f992a9..822bf8905bf3ce 100644
>> --- a/drivers/watchdog/sb_wdog.c
>> +++ b/drivers/watchdog/sb_wdog.c
>> @@ -1,3 +1,4 @@
>> +// SPDX-License-Identifier: GPL-1.0+
>> /*
>> * Watchdog driver for SiByte SB1 SoCs
>> *
>> @@ -38,10 +39,6 @@
>> * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
>> * All Rights Reserved.
>> *
>> - * This program is free software; you can redistribute it and/or
>> - * modify it under the terms of the GNU General Public License
>> - * version 1 or 2 as published by the Free Software Foundation.
>
> Shouldn't this be
> // SPDX-License-Identifier: GPL-1.0 OR GPL-2.0
> (or in current SPDX notation GPL-1.0-only OR GPL-2.0-only) ?
>
Nope, as it will fail spdxcheck.py. Also, SPDX specification [1]
doesn't have negation operator (NOT), thus the licensing requirement
on the above notice can't be expressed reliably in SPDX here.
[1]: https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier
2023-05-13 10:52 ` Bagas Sanjaya
@ 2023-05-13 13:43 ` Richard Fontana
2023-05-13 15:07 ` Greg Kroah-Hartman
0 siblings, 1 reply; 28+ messages in thread
From: Richard Fontana @ 2023-05-13 13:43 UTC (permalink / raw)
To: Bagas Sanjaya
Cc: Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Greg Kroah-Hartman,
Wim Van Sebroeck, Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Ray Lehtiniemi, Alessandro Zummo,
Andrey Panin, Oleg Drokin, Marc Zyngier, Jonas Jensen,
Sylver Bruneau, Andrew Sharp, Denis Turischev, Mika Westerberg,
Alan Cox, Simon Horman
On Sat, May 13, 2023 at 6:53 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
>
> On 5/12/23 19:46, Richard Fontana wrote:
> > On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
> >
> >
> >> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
> >> index 504be461f992a9..822bf8905bf3ce 100644
> >> --- a/drivers/watchdog/sb_wdog.c
> >> +++ b/drivers/watchdog/sb_wdog.c
> >> @@ -1,3 +1,4 @@
> >> +// SPDX-License-Identifier: GPL-1.0+
> >> /*
> >> * Watchdog driver for SiByte SB1 SoCs
> >> *
> >> @@ -38,10 +39,6 @@
> >> * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
> >> * All Rights Reserved.
> >> *
> >> - * This program is free software; you can redistribute it and/or
> >> - * modify it under the terms of the GNU General Public License
> >> - * version 1 or 2 as published by the Free Software Foundation.
> >
> > Shouldn't this be
> > // SPDX-License-Identifier: GPL-1.0 OR GPL-2.0
> > (or in current SPDX notation GPL-1.0-only OR GPL-2.0-only) ?
> >
>
> Nope, as it will fail spdxcheck.py. Also, SPDX specification [1]
> doesn't have negation operator (NOT), thus the licensing requirement
> on the above notice can't be expressed reliably in SPDX here.
>
> [1]: https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/
The GPL identifiers in recent versions of SPDX include an `-only` and
an `-or-later` variant. So I don't see why you can't represent it as
`GPL-1.0-only OR GPL-2.0-only`. From what I understand the kernel
requires/prefers use of the earlier approach to GPL identifiers (which
was better in my opinion) under which `GPL-1.0 OR GPL-2.0` would at
least be semantically similar. I don't see why you need a negation
operator in this case. You have other patches where you used the
`-only` identifiers.
Richard
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier
2023-05-13 13:43 ` Richard Fontana
@ 2023-05-13 15:07 ` Greg Kroah-Hartman
2023-05-14 13:08 ` Guenter Roeck
0 siblings, 1 reply; 28+ messages in thread
From: Greg Kroah-Hartman @ 2023-05-13 15:07 UTC (permalink / raw)
To: Richard Fontana
Cc: Bagas Sanjaya, Linux SPDX Licenses, Linux DRI Development,
Linux Kernel Mailing List, Linux Networking, Linux ARM,
Linux Staging Drivers, Linux Watchdog Devices,
Linux Kernel Actions, Diederik de Haas, Kate Stewart,
Philippe Ombredanne, Thomas Gleixner, David Airlie, Karsten Keil,
Jay Vosburgh, Andy Gospodarek, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Sam Creasey, Dominik Brodowski,
Daniel Mack, Haojian Zhuang, Robert Jarzmik, Wim Van Sebroeck,
Guenter Roeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Ray Lehtiniemi, Alessandro Zummo,
Andrey Panin, Oleg Drokin, Marc Zyngier, Jonas Jensen,
Sylver Bruneau, Andrew Sharp, Denis Turischev, Mika Westerberg,
Alan Cox, Simon Horman
On Sat, May 13, 2023 at 09:43:39AM -0400, Richard Fontana wrote:
> On Sat, May 13, 2023 at 6:53 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
> >
> > On 5/12/23 19:46, Richard Fontana wrote:
> > > On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
> > >
> > >
> > >> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
> > >> index 504be461f992a9..822bf8905bf3ce 100644
> > >> --- a/drivers/watchdog/sb_wdog.c
> > >> +++ b/drivers/watchdog/sb_wdog.c
> > >> @@ -1,3 +1,4 @@
> > >> +// SPDX-License-Identifier: GPL-1.0+
> > >> /*
> > >> * Watchdog driver for SiByte SB1 SoCs
> > >> *
> > >> @@ -38,10 +39,6 @@
> > >> * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
> > >> * All Rights Reserved.
> > >> *
> > >> - * This program is free software; you can redistribute it and/or
> > >> - * modify it under the terms of the GNU General Public License
> > >> - * version 1 or 2 as published by the Free Software Foundation.
> > >
> > > Shouldn't this be
> > > // SPDX-License-Identifier: GPL-1.0 OR GPL-2.0
> > > (or in current SPDX notation GPL-1.0-only OR GPL-2.0-only) ?
> > >
> >
> > Nope, as it will fail spdxcheck.py. Also, SPDX specification [1]
> > doesn't have negation operator (NOT), thus the licensing requirement
> > on the above notice can't be expressed reliably in SPDX here.
> >
> > [1]: https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/
>
> The GPL identifiers in recent versions of SPDX include an `-only` and
> an `-or-later` variant.
But Linux does not use the newer versions of SPDX given that we started
the conversion before the "-only" variant came out. Let's stick with
the original one please before worrying about converting to a newer
version of SPDX and mixing things up.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier
2023-05-13 15:07 ` Greg Kroah-Hartman
@ 2023-05-14 13:08 ` Guenter Roeck
0 siblings, 0 replies; 28+ messages in thread
From: Guenter Roeck @ 2023-05-14 13:08 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Richard Fontana, Bagas Sanjaya, Linux SPDX Licenses,
Linux DRI Development, Linux Kernel Mailing List,
Linux Networking, Linux ARM, Linux Staging Drivers,
Linux Watchdog Devices, Linux Kernel Actions, Diederik de Haas,
Kate Stewart, Philippe Ombredanne, Thomas Gleixner, David Airlie,
Karsten Keil, Jay Vosburgh, Andy Gospodarek, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Sam Creasey,
Dominik Brodowski, Daniel Mack, Haojian Zhuang, Robert Jarzmik,
Wim Van Sebroeck, Jan Kara, Andreas Färber,
Manivannan Sadhasivam, Ray Lehtiniemi, Alessandro Zummo,
Andrey Panin, Oleg Drokin, Marc Zyngier, Jonas Jensen,
Sylver Bruneau, Andrew Sharp, Denis Turischev, Mika Westerberg,
Alan Cox, Simon Horman
On Sun, May 14, 2023 at 12:07:28AM +0900, Greg Kroah-Hartman wrote:
> On Sat, May 13, 2023 at 09:43:39AM -0400, Richard Fontana wrote:
> > On Sat, May 13, 2023 at 6:53 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
> > >
> > > On 5/12/23 19:46, Richard Fontana wrote:
> > > > On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
> > > >
> > > >
> > > >> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
> > > >> index 504be461f992a9..822bf8905bf3ce 100644
> > > >> --- a/drivers/watchdog/sb_wdog.c
> > > >> +++ b/drivers/watchdog/sb_wdog.c
> > > >> @@ -1,3 +1,4 @@
> > > >> +// SPDX-License-Identifier: GPL-1.0+
> > > >> /*
> > > >> * Watchdog driver for SiByte SB1 SoCs
> > > >> *
> > > >> @@ -38,10 +39,6 @@
> > > >> * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
> > > >> * All Rights Reserved.
> > > >> *
> > > >> - * This program is free software; you can redistribute it and/or
> > > >> - * modify it under the terms of the GNU General Public License
> > > >> - * version 1 or 2 as published by the Free Software Foundation.
> > > >
> > > > Shouldn't this be
> > > > // SPDX-License-Identifier: GPL-1.0 OR GPL-2.0
> > > > (or in current SPDX notation GPL-1.0-only OR GPL-2.0-only) ?
> > > >
> > >
> > > Nope, as it will fail spdxcheck.py. Also, SPDX specification [1]
> > > doesn't have negation operator (NOT), thus the licensing requirement
> > > on the above notice can't be expressed reliably in SPDX here.
> > >
> > > [1]: https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/
> >
> > The GPL identifiers in recent versions of SPDX include an `-only` and
> > an `-or-later` variant.
>
> But Linux does not use the newer versions of SPDX given that we started
> the conversion before the "-only" variant came out. Let's stick with
> the original one please before worrying about converting to a newer
> version of SPDX and mixing things up.
>
Either case I'd prefer to have no conversion if there is no means
to express the original license (ie GPL-1.0 or GPL-2.0 and nothing else)
in acceptable SPDX form.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2023-05-14 13:08 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 01/10] agp/amd64: Remove GPL distribution notice Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 02/10] mISDN: Replace GPL notice boilerplate with SPDX identifier Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 03/10] net: bonding: Add SPDX identifier to remaining files Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier Bagas Sanjaya
2023-05-12 11:27 ` Geert Uytterhoeven
2023-05-12 13:03 ` Richard Fontana
2023-05-12 10:06 ` [PATCH v2 05/10] net: ethernet: i825xx: " Bagas Sanjaya
2023-05-12 11:21 ` Greg Kroah-Hartman
2023-05-12 10:06 ` [PATCH v2 06/10] pcmcia: Add " Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 07/10] drivers: staging: wlan-ng: Remove GPL/MPL boilerplate Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier Bagas Sanjaya
2023-05-12 12:46 ` Richard Fontana
2023-05-13 10:52 ` Bagas Sanjaya
2023-05-13 13:43 ` Richard Fontana
2023-05-13 15:07 ` Greg Kroah-Hartman
2023-05-14 13:08 ` Guenter Roeck
2023-05-12 12:49 ` Guenter Roeck
2023-05-12 12:50 ` Bagas Sanjaya
2023-05-12 13:14 ` Andreas Färber
2023-05-12 10:06 ` [PATCH v2 09/10] udf: Replace " Bagas Sanjaya
2023-05-12 13:21 ` Richard Fontana
2023-05-13 9:31 ` Bagas Sanjaya
2023-05-13 9:48 ` Pali Rohár
2023-05-13 9:59 ` Greg Kroah-Hartman
2023-05-12 10:06 ` [PATCH v2 10/10] include: synclink: Replace GPL " Bagas Sanjaya
2023-05-12 11:23 ` [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Greg Kroah-Hartman
2023-05-13 9:25 ` Bagas Sanjaya
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).