Deep review of 'COX' disclaimers
cover Deep review of 'COX' disclaimers
The 'COX' disclaimers are named after the assumed inventor (Alan Cox). They contain the following pattern:
Neither $PERSON nor $CORP admit liability nor provide warranty for any of this software. This material is provided as is and at no charge.
$PERSON and $CORP are placeholders for individuals and corporations which vary with the various source files. But other than the names the wording is identical throughout all.
The individuals have a copyright notice in the affected files. The email address belongs to the associated corporates.
Interesting question what to do with those.
Thanks,
tglx
PATCH 1/2 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100
From: Thomas Gleixner [email protected]
Based on 2 normalized pattern(s):
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [alan] [cox] [nor] [cymrunet] [ltd] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [sven] [anders] [marcus] [junker] [nor] [anduras] [ag] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
extracted by the scancode license scanner the SPDX license identifier
GPL-2.0-or-later
has been chosen to replace the boilerplate/reference in 12 file(s).
Bucket: COX
---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=cox&id=97c1321a69cd
--- arch/um/drivers/harddog_kern.c | 10 +--------- drivers/watchdog/acquirewdt.c | 10 +--------- drivers/watchdog/advantechwdt.c | 10 +--------- drivers/watchdog/eurotechwdt.c | 10 +--------- drivers/watchdog/ib700wdt.c | 11 +---------- drivers/watchdog/pc87413_wdt.c | 10 +--------- drivers/watchdog/sbc8360.c | 11 +---------- drivers/watchdog/softdog.c | 10 +--------- drivers/watchdog/w83627hf_wdt.c | 10 +--------- drivers/watchdog/wafer5823wdt.c | 11 +---------- drivers/watchdog/wdt.c | 10 +--------- drivers/watchdog/wdt_pci.c | 10 +--------- 12 files changed, 12 insertions(+), 111 deletions(-)
arch/um/drivers/harddog_kern.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* UML hardware watchdog, shamelessly stolen from: * * SoftDog 0.05: A Software Watchdog Device
@@ -5,15 +6,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved. * http://www.redhat.com * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Software only watchdog driver. Unlike its big brother the WDT501P
drivers/watchdog/acquirewdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Acquire Single Board Computer Watchdog Timer driver *
@@ -6,15 +7,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]>
drivers/watchdog/advantechwdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Advantech Single Board Computer WDT driver *
@@ -9,15 +10,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]>
drivers/watchdog/eurotechwdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Eurotech CPU-1220/1410/1420 on board WDT driver *
@@ -11,15 +12,6 @@* (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]>* */
drivers/watchdog/ib700wdt.c +1 -10
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * IB700 Single Board Computer WDT driver *
@@ -14,21 +15,11 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]> * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * Added timeout module option to override default -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/pc87413_wdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NS pc87413-wdt Watchdog Timer driver for Linux 2.6.x.x *
@@ -6,15 +7,6 @@* (C) Copyright 2006 Sven Anders, <[email protected]> * and Marcus Junker, <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Sven Anders, Marcus Junker nor ANDURAS AG -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. -* * Release 1.1 */
drivers/watchdog/sbc8360.c +1 -10
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SBC8360 Watchdog driver *
@@ -19,21 +20,11 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]> * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * Added timeout module option to override default -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/softdog.c +1 -9
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SoftDog: A Software Watchdog Device * * (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Software only watchdog driver. Unlike its big brother the WDT501P
drivers/watchdog/w83627hf_wdt.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * w83627hf/thf WDT driver *
@@ -17,15 +18,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> */
drivers/watchdog/wafer5823wdt.c +1 -10
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ICP Wafer 5823 Single Board Computer WDT driver * http://www.icpamerica.com/wafer_5823.php
@@ -13,17 +14,7 @@* (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/wdt.c +1 -9
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Industrial Computer Source WDT501 driver * * (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Release 0.10.
drivers/watchdog/wdt_pci.c +1 -9
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Industrial Computer Source PCI-WDT500/501 driver * * (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Release 0.10.
Re: [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100
I'd suggest this might be a good example of one where we want to (1) still add the SPDX tag, but (2) leave the existing notice text in place and wrap it in something like a NOTICE_BEGIN / NOTICE END block.
The specific reference to individual / entity, plus the non-standard language about e.g. not admitting liability, makes me think that it's better to leave this in place. I do think GPL-2.0-or-later is the right tag but I'm inclined not to delete the notice altogether.
Quoted 336 lines · Thomas Gleixner
From: Thomas Gleixner [email protected]
Based on 2 normalized pattern(s):
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [alan] [cox] [nor] [cymrunet] [ltd] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [sven] [anders] [marcus] [junker] [nor] [anduras] [ag] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
extracted by the scancode license scanner the SPDX license identifier
GPL-2.0-or-later
has been chosen to replace the boilerplate/reference in 12 file(s).
Bucket: COX
Signed-off-by Thomas Gleixner <[email protected]>---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=cox&id=97c1321a69cd--- arch/um/drivers/harddog_kern.c | 10 +--------- drivers/watchdog/acquirewdt.c | 10 +--------- drivers/watchdog/advantechwdt.c | 10 +--------- drivers/watchdog/eurotechwdt.c | 10 +--------- drivers/watchdog/ib700wdt.c | 11 +---------- drivers/watchdog/pc87413_wdt.c | 10 +--------- drivers/watchdog/sbc8360.c | 11 +---------- drivers/watchdog/softdog.c | 10 +--------- drivers/watchdog/w83627hf_wdt.c | 10 +--------- drivers/watchdog/wafer5823wdt.c | 11 +---------- drivers/watchdog/wdt.c | 10 +--------- drivers/watchdog/wdt_pci.c | 10 +--------- 12 files changed, 12 insertions(+), 111 deletions(-)arch/um/drivers/harddog_kern.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* UML hardware watchdog, shamelessly stolen from: * * SoftDog 0.05: A Software Watchdog Device @@ -5,15 +6,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved. * http://www.redhat.com * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Software only watchdog driver. Unlike its big brother the WDT501P drivers/watchdog/acquirewdt.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Acquire Single Board Computer Watchdog Timer driver * @@ -6,15 +7,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]> drivers/watchdog/advantechwdt.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Advantech Single Board Computer WDT driver * @@ -9,15 +10,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]> drivers/watchdog/eurotechwdt.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Eurotech CPU-1220/1410/1420 on board WDT driver * @@ -11,15 +12,6 @@* (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]>* */ drivers/watchdog/ib700wdt.c +1
-10@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * IB700 Single Board Computer WDT driver * @@ -14,21 +15,11 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]> * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * Added timeout module option to override default -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmtdrivers/watchdog/pc87413_wdt.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NS pc87413-wdt Watchdog Timer driver for Linux 2.6.x.x * @@ -6,15 +7,6 @@* (C) Copyright 2006 Sven Anders, <[email protected]> * and Marcus Junker, <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Sven Anders, Marcus Junker nor ANDURAS AG -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. -* * Release 1.1 */ drivers/watchdog/sbc8360.c +1
-10@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SBC8360 Watchdog driver * @@ -19,21 +20,11 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]> * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * Added timeout module option to override default -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmtdrivers/watchdog/softdog.c +1
-9@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SoftDog: A Software Watchdog Device * * (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Software only watchdog driver. Unlike its big brother the WDT501P drivers/watchdog/w83627hf_wdt.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * w83627hf/thf WDT driver * @@ -17,15 +18,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> */ drivers/watchdog/wafer5823wdt.c +1
-10@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ICP Wafer 5823 Single Board Computer WDT driver * http://www.icpamerica.com/wafer_5823.php @@ -13,17 +14,7 @@* (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmtdrivers/watchdog/wdt.c +1
-9@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Industrial Computer Source WDT501 driver * * (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Release 0.10. drivers/watchdog/wdt_pci.c +1
-9@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Industrial Computer Source PCI-WDT500/501 driver * * (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Release 0.10.
Signature · 4 lines
Steve Winslow Director of Strategic Programs The Linux Foundation [email protected]
Re: [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100
Quoted 9 lines · Steve Winslow
I'd suggest this might be a good example of one where we want to (1) still add the SPDX tag, but (2) leave the existing notice text in place and wrap it in something like a
NOTICE_BEGIN/ NOTICE END block.The specific reference to individual / entity, plus the non-standard language about e.g. not admitting liability, makes me think that it's better to leave this in place. I do think GPL-2.0-or-later is the right tag but I'm inclined not to delete the notice altogether.
I agree that the "Neither ... " paragraph should be kept in (I don't have an opinion on whether wrapping it in such a block is preferable).
Richard
Quoted 344 lines · Thomas Gleixner
Quoted 326 lines
From: Thomas Gleixner [email protected]
Based on 2 normalized pattern(s):
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [alan] [cox] [nor] [cymrunet] [ltd] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [sven] [anders] [marcus] [junker] [nor] [anduras] [ag] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
extracted by the scancode license scanner the SPDX license identifier
GPL-2.0-or-later
has been chosen to replace the boilerplate/reference in 12 file(s).
Bucket: COX
Signed-off-by Thomas Gleixner <[email protected]>---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=cox&id=97c1321a69cd--- arch/um/drivers/harddog_kern.c | 10 +--------- drivers/watchdog/acquirewdt.c | 10 +--------- drivers/watchdog/advantechwdt.c | 10 +--------- drivers/watchdog/eurotechwdt.c | 10 +--------- drivers/watchdog/ib700wdt.c | 11 +---------- drivers/watchdog/pc87413_wdt.c | 10 +--------- drivers/watchdog/sbc8360.c | 11 +---------- drivers/watchdog/softdog.c | 10 +--------- drivers/watchdog/w83627hf_wdt.c | 10 +--------- drivers/watchdog/wafer5823wdt.c | 11 +---------- drivers/watchdog/wdt.c | 10 +--------- drivers/watchdog/wdt_pci.c | 10 +--------- 12 files changed, 12 insertions(+), 111 deletions(-)arch/um/drivers/harddog_kern.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* UML hardware watchdog, shamelessly stolen from: * * SoftDog 0.05: A Software Watchdog Device @@ -5,15 +6,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, All Rights Reserved. * http://www.redhat.com * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Software only watchdog driver. Unlike its big brother the WDT501P drivers/watchdog/acquirewdt.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Acquire Single Board Computer Watchdog Timer driver * @@ -6,15 +7,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]> drivers/watchdog/advantechwdt.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Advantech Single Board Computer WDT driver * @@ -9,15 +10,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]> drivers/watchdog/eurotechwdt.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Eurotech CPU-1220/1410/1420 on board WDT driver * @@ -11,15 +12,6 @@* (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]>* */ drivers/watchdog/ib700wdt.c +1
-10@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * IB700 Single Board Computer WDT driver * @@ -14,21 +15,11 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]> * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * Added timeout module option to override default -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmtdrivers/watchdog/pc87413_wdt.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NS pc87413-wdt Watchdog Timer driver for Linux 2.6.x.x * @@ -6,15 +7,6 @@* (C) Copyright 2006 Sven Anders, <[email protected]> * and Marcus Junker, <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Sven Anders, Marcus Junker nor ANDURAS AG -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. -* * Release 1.1 */ drivers/watchdog/sbc8360.c +1
-10@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SBC8360 Watchdog driver * @@ -19,21 +20,11 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * 14-Dec-2001 Matt Domsch <[email protected]> * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * Added timeout module option to override default -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmtdrivers/watchdog/softdog.c +1
-9@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SoftDog: A Software Watchdog Device * * (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Software only watchdog driver. Unlike its big brother the WDT501P drivers/watchdog/w83627hf_wdt.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * w83627hf/thf WDT driver * @@ -17,15 +18,6 @@* (c) Copyright 1996 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> */ drivers/watchdog/wafer5823wdt.c +1
-10@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ICP Wafer 5823 Single Board Computer WDT driver * http://www.icpamerica.com/wafer_5823.php @@ -13,17 +14,7 @@* (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> -* */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmtdrivers/watchdog/wdt.c +1
-9@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Industrial Computer Source WDT501 driver * * (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Release 0.10. drivers/watchdog/wdt_pci.c +1
-2@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Industrial Computer Source PCI-WDT500/501 driver * * (c) Copyright 1996-1997 Alan Cox <[email protected]>, * 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 drivers/watchdog/wdt_pci.c line 10
Quoted 10 lines
drivers/watchdog/wdt_pci.c +0
-7-* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox nor CymruNet Ltd. admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 1995 Alan Cox <[email protected]> * * Release 0.10. --
Steve Winslow
Director of Strategic Programs
The Linux Foundation
[email protected]
Signature · 3 lines
Richard Fontana Senior Commercial Counsel Red Hat, Inc.
Re: [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100
Richard,
Quoted 7 lines · Richard Fontana
Quoted 5 lines · Steve Winslow
I'd suggest this might be a good example of one where we want to (1) still add the SPDX tag, but (2) leave the existing notice text in place and wrap it in something like a
NOTICE_BEGIN/ NOTICE END block.
Quoted 7 lines
Quoted 4 lines
The specific reference to individual / entity, plus the non-standard language about e.g. not admitting liability, makes me think that it's better to leave this in place. I do think GPL-2.0-or-later is the right tag but I'm inclined not to delete the notice altogether.
I agree that the "Neither ... " paragraph should be kept in (I don't have an opinion on whether wrapping it in such a block is preferable).
The delimiter wrapping is useful in two aspects:
1) It's simpler for tools
2) It's trivial to grep for custom disclaimers without having knowledge of potential keywords.
Thanks,
tglx
Re: [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100
In reply to Steve WinslowQuoted 8 lines · Steve Winslow
I'd suggest this might be a good example of one where we want to (1) still add the SPDX tag, but (2) leave the existing notice text in place and wrap it in something like a
NOTICE_BEGIN/ NOTICE END block.The specific reference to individual / entity, plus the non-standard language about e.g. not admitting liability, makes me think that it's better to leave this in place. I do think GPL-2.0-or-later is the right tag but I'm inclined not to delete the notice altogether.
Agreed, these disclaimers contain specific information that can't be deduced from the SPDX identifiers, so they should be kept. And wrapping the custom disclaimers in some kind of machine readable tags makes sense, though it's worth talking with SPDX to make sure that whatever we add is actually useful.
I notice that there are only 22 total files, so we might be able to shrink the set by contacting the original $PERSON and $CORP, where it's still feasible to do so.
Allison
PATCH 2/2 treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99
In reply to Thomas GleixnerFrom: Thomas Gleixner [email protected]
Based on 4 normalized pattern(s):
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [wim] [van] [sebroeck] nor [iguana] [vzw] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [kernel] [concepts] nor [nils] [faerber] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [oleg] [drokin] nor [ixcelerator] [com] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [alan] [cox] [cymrunet] [ltd] [wim] [van] [sebroeck] nor [iguana] [vzw] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
extracted by the scancode license scanner the SPDX license identifier
GPL-2.0-or-later
has been chosen to replace the boilerplate/reference in 10 file(s).
Bucket: COX
---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=cox&id=2ebaaf62980f
--- drivers/watchdog/iTCO_vendor_support.c | 10 +--------- drivers/watchdog/iTCO_wdt.c | 10 +--------- drivers/watchdog/nv_tco.h | 10 +--------- drivers/watchdog/pcwd_pci.c | 10 +--------- drivers/watchdog/pcwd_usb.c | 10 +--------- drivers/watchdog/sa1100_wdt.c | 10 +--------- drivers/watchdog/sch311x_wdt.c | 10 +--------- drivers/watchdog/watchdog_core.c | 10 +--------- drivers/watchdog/watchdog_core.h | 10 +--------- drivers/watchdog/watchdog_dev.c | 11 +---------- 10 files changed, 10 insertions(+), 91 deletions(-)
drivers/watchdog/iTCO_vendor_support.c +1 -9
@@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * intel TCO vendor specific watchdog driver support * * (c) Copyright 2006-2009 Wim Van Sebroeck <[email protected]>. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /*
drivers/watchdog/iTCO_wdt.c +1 -9
@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * intel TCO Watchdog Driver * * (c) Copyright 2006-2011 Wim Van Sebroeck <[email protected]>. * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. -* * The TCO watchdog is implemented in the following I/O controller hubs: * (See the intel documentation on http://developer.intel.com.) * document number 290655-003, 290677-014: 82801AA (ICH), 82801AB (ICHO)
drivers/watchdog/nv_tco.h +1 -9
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * nv_tco: TCO timer driver for nVidia chipsets. *
@@ -10,15 +11,6 @@* Reserved. * http://www.kernelconcepts.de * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither kernel concepts nor Nils Faerber admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 2000 kernel concepts <[email protected]> * developed for * Jentro AG, Haar/Munich (Germany)
drivers/watchdog/pcwd_pci.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Berkshire PCI-PC Watchdog Card Driver *
@@ -9,15 +10,6 @@* Alan Cox <[email protected]>, * Matt Domsch <[email protected]>, * Rob Radez <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /*
drivers/watchdog/pcwd_usb.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Berkshire USB-PC Watchdog Card Driver *
@@ -10,15 +11,6 @@* Rob Radez <[email protected]>, * Greg Kroah-Hartman <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. -* * Thanks also to Simon Machell at Berkshire Products Inc. for * providing the test hardware. More info is available at * http://www.berkprod.com/ or http://www.pcwatchdog.com/
drivers/watchdog/sa1100_wdt.c +1 -9
@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for the SA11x0/PXA2xx * * (c) Copyright 2000 Oleg Drokin <[email protected]> * Based on SoftDog driver by Alan Cox <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Oleg Drokin nor iXcelerator.com admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 2000 Oleg Drokin <[email protected]> * * 27/11/2000 Initial release
drivers/watchdog/sch311x_wdt.c +1 -9
@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sch311x_wdt.c - Driver for the SCH311x Super-I/O chips * integrated watchdog. * * (c) Copyright 2008 Wim Van Sebroeck <[email protected]>. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /*
drivers/watchdog/watchdog_core.c +1 -9
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * watchdog_core.c *
@@ -15,15 +16,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
drivers/watchdog/watchdog_core.h +1 -9
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * watchdog_core.h *
@@ -15,15 +16,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define MAX_DOGS 32/* Maximum number of watchdog devices */
drivers/watchdog/watchdog_dev.c +1 -10
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * watchdog_dev.c *
@@ -6,7 +7,6 @@* * (c) Copyright 2008-2011 Wim Van Sebroeck <[email protected]>. * -* * This source code is part of the generic code that can be used * by all the watchdog timer drivers. *
@@ -19,15 +19,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99
Same comment here as with COX patch 1/2 rule 100... I'm inclined to suggest adding the tag but leaving the notice here, wrapped in some sort of delimiters that tools can easily detect.
Quoted 291 lines · Thomas Gleixner
From: Thomas Gleixner [email protected]
Based on 4 normalized pattern(s):
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [wim] [van] [sebroeck] nor [iguana] [vzw] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [kernel] [concepts] nor [nils] [faerber] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [oleg] [drokin] nor [ixcelerator] [com] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [alan] [cox] [cymrunet] [ltd] [wim] [van] [sebroeck] nor [iguana] [vzw] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
extracted by the scancode license scanner the SPDX license identifier
GPL-2.0-or-later
has been chosen to replace the boilerplate/reference in 10 file(s).
Bucket: COX
Signed-off-by Thomas Gleixner <[email protected]>---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=cox&id=2ebaaf62980f--- drivers/watchdog/iTCO_vendor_support.c | 10 +--------- drivers/watchdog/iTCO_wdt.c | 10 +--------- drivers/watchdog/nv_tco.h | 10 +--------- drivers/watchdog/pcwd_pci.c | 10 +--------- drivers/watchdog/pcwd_usb.c | 10 +--------- drivers/watchdog/sa1100_wdt.c | 10 +--------- drivers/watchdog/sch311x_wdt.c | 10 +--------- drivers/watchdog/watchdog_core.c | 10 +--------- drivers/watchdog/watchdog_core.h | 10 +--------- drivers/watchdog/watchdog_dev.c | 11 +---------- 10 files changed, 10 insertions(+), 91 deletions(-)drivers/watchdog/iTCO_vendor_support.c +1
-9@@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * intel TCO vendor specific watchdog driver support * * (c) Copyright 2006-2009 Wim Van Sebroeck <[email protected]>. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /* drivers/watchdog/iTCO_wdt.c +1
-9@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * intel TCO Watchdog Driver * * (c) Copyright 2006-2011 Wim Van Sebroeck <[email protected]>. * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. -* * The TCO watchdog is implemented in the following I/O controller hubs: * (See the intel documentation on http://developer.intel.com.) * document number 290655-003, 290677-014: 82801AA (ICH), 82801AB (ICHO) drivers/watchdog/nv_tco.h +1
-9@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * nv_tco: TCO timer driver for nVidia chipsets. * @@ -10,15 +11,6 @@* Reserved. * http://www.kernelconcepts.de * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither kernel concepts nor Nils Faerber admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 2000 kernel concepts <[email protected]> * developed for * Jentro AG, Haar/Munich (Germany) drivers/watchdog/pcwd_pci.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Berkshire PCI-PC Watchdog Card Driver * @@ -9,15 +10,6 @@* Alan Cox <[email protected]>, * Matt Domsch <[email protected]>, * Rob Radez <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /* drivers/watchdog/pcwd_usb.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Berkshire USB-PC Watchdog Card Driver * @@ -10,15 +11,6 @@* Rob Radez <[email protected]>, * Greg Kroah-Hartman <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. -* * Thanks also to Simon Machell at Berkshire Products Inc. for * providing the test hardware. More info is available at * http://www.berkprod.com/ or http://www.pcwatchdog.com/ drivers/watchdog/sa1100_wdt.c +1
-9@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for the SA11x0/PXA2xx * * (c) Copyright 2000 Oleg Drokin <[email protected]> * Based on SoftDog driver by Alan Cox <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Oleg Drokin nor iXcelerator.com admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 2000 Oleg Drokin <[email protected]> * * 27/11/2000 Initial release drivers/watchdog/sch311x_wdt.c +1
-9@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sch311x_wdt.c - Driver for the SCH311x Super-I/O chips * integrated watchdog. * * (c) Copyright 2008 Wim Van Sebroeck <[email protected]>. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /* drivers/watchdog/watchdog_core.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * watchdog_core.c * @@ -15,15 +16,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmtdrivers/watchdog/watchdog_core.h +1
-9@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * watchdog_core.h * @@ -15,15 +16,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define MAX_DOGS 32/* Maximum number of watchdog devices */ drivers/watchdog/watchdog_dev.c +1
-10@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * watchdog_dev.c * @@ -6,7 +7,6 @@* * (c) Copyright 2008-2011 Wim Van Sebroeck <[email protected]>. * -* * This source code is part of the generic code that can be used * by all the watchdog timer drivers. * @@ -19,15 +19,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
Signature · 4 lines
Steve Winslow Director of Strategic Programs The Linux Foundation [email protected]
Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99
Quoted 4 lines · Steve Winslow
Same comment here as with COX patch 1/2 rule 100... I'm inclined to suggest adding the tag but leaving the notice here, wrapped in some sort of delimiters that tools can easily detect.
Agreed that the "Neither ..." paragraph should be retained. I don't have an opinion on the desirability of wrapping it in delimiters.
Richard
Quoted 300 lines · Thomas Gleixner
Quoted 281 lines
From: Thomas Gleixner [email protected]
Based on 4 normalized pattern(s):
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [wim] [van] [sebroeck] nor [iguana] [vzw] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [kernel] [concepts] nor [nils] [faerber] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [oleg] [drokin] nor [ixcelerator] [com] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
this program is free software you can redistribute it and or modify it under the terms of the gnu general public license as published by the free software foundation either version 2 of the license or at your option any later version neither [alan] [cox] [cymrunet] [ltd] [wim] [van] [sebroeck] nor [iguana] [vzw] admit liability nor provide warranty for any of this software this material is provided as is and at no charge
extracted by the scancode license scanner the SPDX license identifier
GPL-2.0-or-later
has been chosen to replace the boilerplate/reference in 10 file(s).
Bucket: COX
Signed-off-by Thomas Gleixner <[email protected]>---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=cox&id=2ebaaf62980f--- drivers/watchdog/iTCO_vendor_support.c | 10 +--------- drivers/watchdog/iTCO_wdt.c | 10 +--------- drivers/watchdog/nv_tco.h | 10 +--------- drivers/watchdog/pcwd_pci.c | 10 +--------- drivers/watchdog/pcwd_usb.c | 10 +--------- drivers/watchdog/sa1100_wdt.c | 10 +--------- drivers/watchdog/sch311x_wdt.c | 10 +--------- drivers/watchdog/watchdog_core.c | 10 +--------- drivers/watchdog/watchdog_core.h | 10 +--------- drivers/watchdog/watchdog_dev.c | 11 +---------- 10 files changed, 10 insertions(+), 91 deletions(-)drivers/watchdog/iTCO_vendor_support.c +1
-9@@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * intel TCO vendor specific watchdog driver support * * (c) Copyright 2006-2009 Wim Van Sebroeck <[email protected]>. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /* drivers/watchdog/iTCO_wdt.c +1
-9@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * intel TCO Watchdog Driver * * (c) Copyright 2006-2011 Wim Van Sebroeck <[email protected]>. * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. -* * The TCO watchdog is implemented in the following I/O controller hubs: * (See the intel documentation on http://developer.intel.com.) * document number 290655-003, 290677-014: 82801AA (ICH), 82801AB (ICHO) drivers/watchdog/nv_tco.h +1
-9@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * nv_tco: TCO timer driver for nVidia chipsets. * @@ -10,15 +11,6 @@* Reserved. * http://www.kernelconcepts.de * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither kernel concepts nor Nils Faerber admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 2000 kernel concepts <[email protected]> * developed for * Jentro AG, Haar/Munich (Germany) drivers/watchdog/pcwd_pci.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Berkshire PCI-PC Watchdog Card Driver * @@ -9,15 +10,6 @@* Alan Cox <[email protected]>, * Matt Domsch <[email protected]>, * Rob Radez <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /* drivers/watchdog/pcwd_usb.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Berkshire USB-PC Watchdog Card Driver * @@ -10,15 +11,6 @@* Rob Radez <[email protected]>, * Greg Kroah-Hartman <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. -* * Thanks also to Simon Machell at Berkshire Products Inc. for * providing the test hardware. More info is available at * http://www.berkprod.com/ or http://www.pcwatchdog.com/ drivers/watchdog/sa1100_wdt.c +1
-9@@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for the SA11x0/PXA2xx * * (c) Copyright 2000 Oleg Drokin <[email protected]> * Based on SoftDog driver by Alan Cox <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Oleg Drokin nor iXcelerator.com admit liability nor provide -* warranty for any of this software. This material is provided -* "AS-IS" and at no charge. -* * (c) Copyright 2000 Oleg Drokin <[email protected]> * * 27/11/2000 Initial release drivers/watchdog/sch311x_wdt.c +1
-9@@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sch311x_wdt.c - Driver for the SCH311x Super-I/O chips * integrated watchdog. * * (c) Copyright 2008 Wim Van Sebroeck <[email protected]>. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor -* provide warranty for any of this software. This material is -* provided "AS-IS" and at no charge. */ /* drivers/watchdog/watchdog_core.c +1
-9@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * watchdog_core.c * @@ -15,15 +16,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmtdrivers/watchdog/watchdog_core.h +1
-9@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * watchdog_core.h * @@ -15,15 +16,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define MAX_DOGS 32/* Maximum number of watchdog devices */ drivers/watchdog/watchdog_dev.c +1
-3@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * watchdog_dev.c * @@ -6,7 +7,6 @@* * (c) Copyright 2008-2011 Wim Van Sebroeck <[email protected]>. * -* * This source code is part of the generic code that can be used * by all the watchdog timer drivers. * @@ -19,15 +19,6 @@* Rusty Lynch <[email protected]> * Satyam Sharma <[email protected]> * Randy Dunlap <[email protected]> -* -* This program is free software; you can redistribute it and/or drivers/watchdog/watchdog_dev.c line 24
Quoted 10 lines
drivers/watchdog/watchdog_dev.c +0
-7-* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. -* -* Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. -* admit liability nor provide warranty for any of this software. -* This material is provided "AS-IS" and at no charge. */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt--
Steve Winslow
Director of Strategic Programs
The Linux Foundation
[email protected]
Signature · 3 lines
Richard Fontana Senior Commercial Counsel Red Hat, Inc.
Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99
In reply to Thomas GleixnerOn 06.06.19 11:53, Thomas Gleixner wrote:
Hi folks,
<snip>
as that's seems to be a non-trivial matter, I've had some private conversations with some of the affected authors. Got positive response from Wim Van Sebroeck and Nicole Faerber (formerly Nico Faerber).
--mtx
Signature · 3 lines
Enrico Weigelt, metux IT consult Free software and Linux embedded engineering [email protected] -- +49-151-27565287
Greg KH
maintainerRe: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99
Quoted 7 lines · metux IT consult
On 06.06.19 11:53, Thomas Gleixner wrote:
Hi folks,
<snip>
as that's seems to be a non-trivial matter,
_what_ is a non-trivial matter? You snipped all of the relevant information here :(
Quoted 4 lines
I've had some
private conversations with some of the affected authors. Got positive response from Wim Van Sebroeck and Nicole Faerber (formerly Nico Faerber).
That's pointless, please discuss this in public, so that everyone can see it, and it can be properly recorded. Don't annoy kernel developers with private emails, it just makes them grumpy and does not scale (I have an autobot for that very reason...)
thanks,
greg k-h
Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99
Quoted 11 lines · Greg KH
Quoted 4 lines · metux IT consult
I've had some
private conversations with some of the affected authors. Got positive response from Wim Van Sebroeck and Nicole Faerber (formerly Nico Faerber).That's pointless, please discuss this in public, so that everyone can see it, and it can be properly recorded. Don't annoy kernel developers with private emails, it just makes them grumpy and does not scale (I have an autobot for that very reason...)
Aside of that, running off and asking random people random questions is not leading anywhere. The reason why we discuss these things in detail on the list is that we have a proper (legaly correct and conclusive) question to ask the people we want to contact. We spent a massive amount of time to start this and figure out proper proceedings. The least thing we need right now is (well meant) actionism behind our back.
Thanks,
tglx