* [COX patch 0/2] Deep review of 'COX' disclaimers
@ 2019-06-06 9:53 Thomas Gleixner
2019-06-06 9:53 ` [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100 Thomas Gleixner
2019-06-06 9:53 ` [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 Thomas Gleixner
0 siblings, 2 replies; 12+ messages in thread
From: Thomas Gleixner @ 2019-06-06 9:53 UTC (permalink / raw)
To: linux-spdx
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
^ permalink raw reply [flat|nested] 12+ messages in thread* [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100 2019-06-06 9:53 [COX patch 0/2] Deep review of 'COX' disclaimers Thomas Gleixner @ 2019-06-06 9:53 ` Thomas Gleixner 2019-06-06 12:39 ` Steve Winslow 2019-06-06 9:53 ` [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 Thomas Gleixner 1 sibling, 1 reply; 12+ messages in thread From: Thomas Gleixner @ 2019-06-06 9:53 UTC (permalink / raw) To: linux-spdx From: Thomas Gleixner tglx@linutronix.de 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 <tglx@linutronix.de> --- 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(-) --- a/arch/um/drivers/harddog_kern.c +++ b/arch/um/drivers/harddog_kern.c @@ -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 <alan@redhat.com>, 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 <alan@lxorguk.ukuu.org.uk> * * Software only watchdog driver. Unlike its big brother the WDT501P --- a/drivers/watchdog/acquirewdt.c +++ b/drivers/watchdog/acquirewdt.c @@ -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 <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 - * 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 <alan@lxorguk.ukuu.org.uk> * * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> --- a/drivers/watchdog/advantechwdt.c +++ b/drivers/watchdog/advantechwdt.c @@ -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 <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 - * 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 <alan@lxorguk.ukuu.org.uk> * * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> --- a/drivers/watchdog/eurotechwdt.c +++ b/drivers/watchdog/eurotechwdt.c @@ -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 <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 - * 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 <alan@lxorguk.ukuu.org.uk>* */ --- a/drivers/watchdog/ib700wdt.c +++ b/drivers/watchdog/ib700wdt.c @@ -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 <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 - * 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 <alan@lxorguk.ukuu.org.uk> * * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * Added timeout module option to override default - * */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt --- a/drivers/watchdog/pc87413_wdt.c +++ b/drivers/watchdog/pc87413_wdt.c @@ -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, <anders@anduras.de> * and Marcus Junker, <junker@anduras.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 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 */ --- a/drivers/watchdog/sbc8360.c +++ b/drivers/watchdog/sbc8360.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SBC8360 Watchdog driver * @@ -19,21 +20,11 @@ * (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 - * 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 <alan@lxorguk.ukuu.org.uk> * * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT * Added timeout module option to override default - * */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt --- a/drivers/watchdog/softdog.c +++ b/drivers/watchdog/softdog.c @@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SoftDog: A Software Watchdog Device * * (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 - * 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 <alan@lxorguk.ukuu.org.uk> * * Software only watchdog driver. Unlike its big brother the WDT501P --- a/drivers/watchdog/w83627hf_wdt.c +++ b/drivers/watchdog/w83627hf_wdt.c @@ -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 <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 - * 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 <alan@lxorguk.ukuu.org.uk> */ --- a/drivers/watchdog/wafer5823wdt.c +++ b/drivers/watchdog/wafer5823wdt.c @@ -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 <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 - * 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 <alan@lxorguk.ukuu.org.uk> - * */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt --- a/drivers/watchdog/wdt.c +++ b/drivers/watchdog/wdt.c @@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Industrial Computer Source WDT501 driver * * (c) Copyright 1996-1997 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 - * 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 <alan@lxorguk.ukuu.org.uk> * * Release 0.10. --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c @@ -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 <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 - * 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 <alan@lxorguk.ukuu.org.uk> * * Release 0.10. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100 2019-06-06 9:53 ` [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100 Thomas Gleixner @ 2019-06-06 12:39 ` Steve Winslow 2019-06-06 14:27 ` Richard Fontana 2019-06-08 20:50 ` Allison Randal 0 siblings, 2 replies; 12+ messages in thread From: Steve Winslow @ 2019-06-06 12:39 UTC (permalink / raw) To: Thomas Gleixner; +Cc: linux-spdx 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. On Thu, Jun 6, 2019 at 6:04 AM Thomas Gleixner <tglx@linutronix.de> wrote: > > From: Thomas Gleixner tglx@linutronix.de > > 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 <tglx@linutronix.de> > > --- > 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(-) > > --- a/arch/um/drivers/harddog_kern.c > +++ b/arch/um/drivers/harddog_kern.c > @@ -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 <alan@redhat.com>, 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 <alan@lxorguk.ukuu.org.uk> > * > * Software only watchdog driver. Unlike its big brother the WDT501P > --- a/drivers/watchdog/acquirewdt.c > +++ b/drivers/watchdog/acquirewdt.c > @@ -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 <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 > - * 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 <alan@lxorguk.ukuu.org.uk> > * > * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> > --- a/drivers/watchdog/advantechwdt.c > +++ b/drivers/watchdog/advantechwdt.c > @@ -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 <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 > - * 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 <alan@lxorguk.ukuu.org.uk> > * > * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> > --- a/drivers/watchdog/eurotechwdt.c > +++ b/drivers/watchdog/eurotechwdt.c > @@ -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 <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 > - * 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 <alan@lxorguk.ukuu.org.uk>* > */ > > --- a/drivers/watchdog/ib700wdt.c > +++ b/drivers/watchdog/ib700wdt.c > @@ -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 <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 > - * 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 <alan@lxorguk.ukuu.org.uk> > * > * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> > * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT > * Added timeout module option to override default > - * > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > --- a/drivers/watchdog/pc87413_wdt.c > +++ b/drivers/watchdog/pc87413_wdt.c > @@ -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, <anders@anduras.de> > * and Marcus Junker, <junker@anduras.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 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 > */ > > --- a/drivers/watchdog/sbc8360.c > +++ b/drivers/watchdog/sbc8360.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * SBC8360 Watchdog driver > * > @@ -19,21 +20,11 @@ > * (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 > - * 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 <alan@lxorguk.ukuu.org.uk> > * > * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> > * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT > * Added timeout module option to override default > - * > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > --- a/drivers/watchdog/softdog.c > +++ b/drivers/watchdog/softdog.c > @@ -1,18 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * SoftDog: A Software Watchdog Device > * > * (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 > - * 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 <alan@lxorguk.ukuu.org.uk> > * > * Software only watchdog driver. Unlike its big brother the WDT501P > --- a/drivers/watchdog/w83627hf_wdt.c > +++ b/drivers/watchdog/w83627hf_wdt.c > @@ -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 <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 > - * 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 <alan@lxorguk.ukuu.org.uk> > */ > > --- a/drivers/watchdog/wafer5823wdt.c > +++ b/drivers/watchdog/wafer5823wdt.c > @@ -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 <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 > - * 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 <alan@lxorguk.ukuu.org.uk> > - * > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > --- a/drivers/watchdog/wdt.c > +++ b/drivers/watchdog/wdt.c > @@ -1,18 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Industrial Computer Source WDT501 driver > * > * (c) Copyright 1996-1997 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 > - * 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 <alan@lxorguk.ukuu.org.uk> > * > * Release 0.10. > --- a/drivers/watchdog/wdt_pci.c > +++ b/drivers/watchdog/wdt_pci.c > @@ -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 <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 > - * 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 <alan@lxorguk.ukuu.org.uk> > * > * Release 0.10. > > -- Steve Winslow Director of Strategic Programs The Linux Foundation swinslow@linuxfoundation.org ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100 2019-06-06 12:39 ` Steve Winslow @ 2019-06-06 14:27 ` Richard Fontana 2019-06-06 15:14 ` Thomas Gleixner 2019-06-08 20:50 ` Allison Randal 1 sibling, 1 reply; 12+ messages in thread From: Richard Fontana @ 2019-06-06 14:27 UTC (permalink / raw) To: Steve Winslow; +Cc: Thomas Gleixner, linux-spdx On Thu, Jun 6, 2019 at 8:39 AM Steve Winslow <swinslow@linuxfoundation.org> wrote: > > 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 > On Thu, Jun 6, 2019 at 6:04 AM Thomas Gleixner <tglx@linutronix.de> wrote: > > > > From: Thomas Gleixner tglx@linutronix.de > > > > 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 <tglx@linutronix.de> > > > > --- > > 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(-) > > > > --- a/arch/um/drivers/harddog_kern.c > > +++ b/arch/um/drivers/harddog_kern.c > > @@ -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 <alan@redhat.com>, 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 <alan@lxorguk.ukuu.org.uk> > > * > > * Software only watchdog driver. Unlike its big brother the WDT501P > > --- a/drivers/watchdog/acquirewdt.c > > +++ b/drivers/watchdog/acquirewdt.c > > @@ -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 <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 > > - * 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 <alan@lxorguk.ukuu.org.uk> > > * > > * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> > > --- a/drivers/watchdog/advantechwdt.c > > +++ b/drivers/watchdog/advantechwdt.c > > @@ -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 <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 > > - * 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 <alan@lxorguk.ukuu.org.uk> > > * > > * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> > > --- a/drivers/watchdog/eurotechwdt.c > > +++ b/drivers/watchdog/eurotechwdt.c > > @@ -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 <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 > > - * 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 <alan@lxorguk.ukuu.org.uk>* > > */ > > > > --- a/drivers/watchdog/ib700wdt.c > > +++ b/drivers/watchdog/ib700wdt.c > > @@ -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 <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 > > - * 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 <alan@lxorguk.ukuu.org.uk> > > * > > * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> > > * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT > > * Added timeout module option to override default > > - * > > */ > > > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > --- a/drivers/watchdog/pc87413_wdt.c > > +++ b/drivers/watchdog/pc87413_wdt.c > > @@ -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, <anders@anduras.de> > > * and Marcus Junker, <junker@anduras.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 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 > > */ > > > > --- a/drivers/watchdog/sbc8360.c > > +++ b/drivers/watchdog/sbc8360.c > > @@ -1,3 +1,4 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > /* > > * SBC8360 Watchdog driver > > * > > @@ -19,21 +20,11 @@ > > * (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 > > - * 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 <alan@lxorguk.ukuu.org.uk> > > * > > * 14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com> > > * Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT > > * Added timeout module option to override default > > - * > > */ > > > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > --- a/drivers/watchdog/softdog.c > > +++ b/drivers/watchdog/softdog.c > > @@ -1,18 +1,10 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > /* > > * SoftDog: A Software Watchdog Device > > * > > * (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 > > - * 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 <alan@lxorguk.ukuu.org.uk> > > * > > * Software only watchdog driver. Unlike its big brother the WDT501P > > --- a/drivers/watchdog/w83627hf_wdt.c > > +++ b/drivers/watchdog/w83627hf_wdt.c > > @@ -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 <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 > > - * 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 <alan@lxorguk.ukuu.org.uk> > > */ > > > > --- a/drivers/watchdog/wafer5823wdt.c > > +++ b/drivers/watchdog/wafer5823wdt.c > > @@ -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 <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 > > - * 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 <alan@lxorguk.ukuu.org.uk> > > - * > > */ > > > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > --- a/drivers/watchdog/wdt.c > > +++ b/drivers/watchdog/wdt.c > > @@ -1,18 +1,10 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > /* > > * Industrial Computer Source WDT501 driver > > * > > * (c) Copyright 1996-1997 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 > > - * 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 <alan@lxorguk.ukuu.org.uk> > > * > > * Release 0.10. > > --- a/drivers/watchdog/wdt_pci.c > > +++ b/drivers/watchdog/wdt_pci.c > > @@ -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 <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 > > - * 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 <alan@lxorguk.ukuu.org.uk> > > * > > * Release 0.10. > > > > > > > -- > Steve Winslow > Director of Strategic Programs > The Linux Foundation > swinslow@linuxfoundation.org -- Richard Fontana Senior Commercial Counsel Red Hat, Inc. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100 2019-06-06 14:27 ` Richard Fontana @ 2019-06-06 15:14 ` Thomas Gleixner 0 siblings, 0 replies; 12+ messages in thread From: Thomas Gleixner @ 2019-06-06 15:14 UTC (permalink / raw) To: Richard Fontana; +Cc: Steve Winslow, linux-spdx Richard, On Thu, 6 Jun 2019, Richard Fontana wrote: > On Thu, Jun 6, 2019 at 8:39 AM Steve Winslow > <swinslow@linuxfoundation.org> wrote: > > > > 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). 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100 2019-06-06 12:39 ` Steve Winslow 2019-06-06 14:27 ` Richard Fontana @ 2019-06-08 20:50 ` Allison Randal 1 sibling, 0 replies; 12+ messages in thread From: Allison Randal @ 2019-06-08 20:50 UTC (permalink / raw) To: Steve Winslow; +Cc: linux-spdx On 6/6/19 8:39 AM, Steve Winslow wrote: > 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 2019-06-06 9:53 [COX patch 0/2] Deep review of 'COX' disclaimers Thomas Gleixner 2019-06-06 9:53 ` [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100 Thomas Gleixner @ 2019-06-06 9:53 ` Thomas Gleixner 2019-06-06 12:41 ` Steve Winslow 2019-06-11 14:24 ` Enrico Weigelt, metux IT consult 1 sibling, 2 replies; 12+ messages in thread From: Thomas Gleixner @ 2019-06-06 9:53 UTC (permalink / raw) To: linux-spdx From: Thomas Gleixner tglx@linutronix.de 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 <tglx@linutronix.de> --- 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(-) --- a/drivers/watchdog/iTCO_vendor_support.c +++ b/drivers/watchdog/iTCO_vendor_support.c @@ -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 <wim@iguana.be>. - * - * 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. */ /* --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * intel TCO Watchdog Driver * * (c) Copyright 2006-2011 Wim Van Sebroeck <wim@iguana.be>. * - * 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) --- a/drivers/watchdog/nv_tco.h +++ b/drivers/watchdog/nv_tco.h @@ -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 <nils@kernelconcepts.de> * developed for * Jentro AG, Haar/Munich (Germany) --- a/drivers/watchdog/pcwd_pci.c +++ b/drivers/watchdog/pcwd_pci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Berkshire PCI-PC Watchdog Card Driver * @@ -9,15 +10,6 @@ * Alan Cox <alan@lxorguk.ukuu.org.uk>, * Matt Domsch <Matt_Domsch@dell.com>, * Rob Radez <rob@osinvestor.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 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. */ /* --- a/drivers/watchdog/pcwd_usb.c +++ b/drivers/watchdog/pcwd_usb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Berkshire USB-PC Watchdog Card Driver * @@ -10,15 +11,6 @@ * Rob Radez <rob@osinvestor.com>, * Greg Kroah-Hartman <greg@kroah.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 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/ --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c @@ -1,18 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for the SA11x0/PXA2xx * * (c) Copyright 2000 Oleg Drokin <green@crimea.edu> * Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk> * - * 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 <green@crimea.edu> * * 27/11/2000 Initial release --- a/drivers/watchdog/sch311x_wdt.c +++ b/drivers/watchdog/sch311x_wdt.c @@ -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 <wim@iguana.be>. - * - * 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. */ /* --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * watchdog_core.c * @@ -15,15 +16,6 @@ * Rusty Lynch <rusty@linux.co.intel.com> * Satyam Sharma <satyam@infradead.org> * Randy Dunlap <randy.dunlap@oracle.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, 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 --- a/drivers/watchdog/watchdog_core.h +++ b/drivers/watchdog/watchdog_core.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * watchdog_core.h * @@ -15,15 +16,6 @@ * Rusty Lynch <rusty@linux.co.intel.com> * Satyam Sharma <satyam@infradead.org> * Randy Dunlap <randy.dunlap@oracle.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, 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 */ --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -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 <wim@iguana.be>. * - * * 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 <rusty@linux.co.intel.com> * Satyam Sharma <satyam@infradead.org> * Randy Dunlap <randy.dunlap@oracle.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, 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 2019-06-06 9:53 ` [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 Thomas Gleixner @ 2019-06-06 12:41 ` Steve Winslow 2019-06-06 14:30 ` Richard Fontana 2019-06-11 14:24 ` Enrico Weigelt, metux IT consult 1 sibling, 1 reply; 12+ messages in thread From: Steve Winslow @ 2019-06-06 12:41 UTC (permalink / raw) To: Thomas Gleixner; +Cc: linux-spdx 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. On Thu, Jun 6, 2019 at 6:04 AM Thomas Gleixner <tglx@linutronix.de> wrote: > > From: Thomas Gleixner tglx@linutronix.de > > 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 <tglx@linutronix.de> > > --- > 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(-) > > --- a/drivers/watchdog/iTCO_vendor_support.c > +++ b/drivers/watchdog/iTCO_vendor_support.c > @@ -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 <wim@iguana.be>. > - * > - * 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. > */ > > /* > --- a/drivers/watchdog/iTCO_wdt.c > +++ b/drivers/watchdog/iTCO_wdt.c > @@ -1,17 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * intel TCO Watchdog Driver > * > * (c) Copyright 2006-2011 Wim Van Sebroeck <wim@iguana.be>. > * > - * 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) > --- a/drivers/watchdog/nv_tco.h > +++ b/drivers/watchdog/nv_tco.h > @@ -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 <nils@kernelconcepts.de> > * developed for > * Jentro AG, Haar/Munich (Germany) > --- a/drivers/watchdog/pcwd_pci.c > +++ b/drivers/watchdog/pcwd_pci.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Berkshire PCI-PC Watchdog Card Driver > * > @@ -9,15 +10,6 @@ > * Alan Cox <alan@lxorguk.ukuu.org.uk>, > * Matt Domsch <Matt_Domsch@dell.com>, > * Rob Radez <rob@osinvestor.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 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. > */ > > /* > --- a/drivers/watchdog/pcwd_usb.c > +++ b/drivers/watchdog/pcwd_usb.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Berkshire USB-PC Watchdog Card Driver > * > @@ -10,15 +11,6 @@ > * Rob Radez <rob@osinvestor.com>, > * Greg Kroah-Hartman <greg@kroah.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 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/ > --- a/drivers/watchdog/sa1100_wdt.c > +++ b/drivers/watchdog/sa1100_wdt.c > @@ -1,18 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Watchdog driver for the SA11x0/PXA2xx > * > * (c) Copyright 2000 Oleg Drokin <green@crimea.edu> > * Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk> > * > - * 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 <green@crimea.edu> > * > * 27/11/2000 Initial release > --- a/drivers/watchdog/sch311x_wdt.c > +++ b/drivers/watchdog/sch311x_wdt.c > @@ -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 <wim@iguana.be>. > - * > - * 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. > */ > > /* > --- a/drivers/watchdog/watchdog_core.c > +++ b/drivers/watchdog/watchdog_core.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * watchdog_core.c > * > @@ -15,15 +16,6 @@ > * Rusty Lynch <rusty@linux.co.intel.com> > * Satyam Sharma <satyam@infradead.org> > * Randy Dunlap <randy.dunlap@oracle.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, 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 > --- a/drivers/watchdog/watchdog_core.h > +++ b/drivers/watchdog/watchdog_core.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * watchdog_core.h > * > @@ -15,15 +16,6 @@ > * Rusty Lynch <rusty@linux.co.intel.com> > * Satyam Sharma <satyam@infradead.org> > * Randy Dunlap <randy.dunlap@oracle.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, 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 */ > --- a/drivers/watchdog/watchdog_dev.c > +++ b/drivers/watchdog/watchdog_dev.c > @@ -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 <wim@iguana.be>. > * > - * > * 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 <rusty@linux.co.intel.com> > * Satyam Sharma <satyam@infradead.org> > * Randy Dunlap <randy.dunlap@oracle.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, 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 swinslow@linuxfoundation.org ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 2019-06-06 12:41 ` Steve Winslow @ 2019-06-06 14:30 ` Richard Fontana 0 siblings, 0 replies; 12+ messages in thread From: Richard Fontana @ 2019-06-06 14:30 UTC (permalink / raw) To: Steve Winslow; +Cc: Thomas Gleixner, linux-spdx On Thu, Jun 6, 2019 at 8:41 AM Steve Winslow <swinslow@linuxfoundation.org> wrote: > > 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 > > On Thu, Jun 6, 2019 at 6:04 AM Thomas Gleixner <tglx@linutronix.de> wrote: > > > > From: Thomas Gleixner tglx@linutronix.de > > > > 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 <tglx@linutronix.de> > > > > --- > > 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(-) > > > > --- a/drivers/watchdog/iTCO_vendor_support.c > > +++ b/drivers/watchdog/iTCO_vendor_support.c > > @@ -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 <wim@iguana.be>. > > - * > > - * 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. > > */ > > > > /* > > --- a/drivers/watchdog/iTCO_wdt.c > > +++ b/drivers/watchdog/iTCO_wdt.c > > @@ -1,17 +1,9 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > /* > > * intel TCO Watchdog Driver > > * > > * (c) Copyright 2006-2011 Wim Van Sebroeck <wim@iguana.be>. > > * > > - * 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) > > --- a/drivers/watchdog/nv_tco.h > > +++ b/drivers/watchdog/nv_tco.h > > @@ -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 <nils@kernelconcepts.de> > > * developed for > > * Jentro AG, Haar/Munich (Germany) > > --- a/drivers/watchdog/pcwd_pci.c > > +++ b/drivers/watchdog/pcwd_pci.c > > @@ -1,3 +1,4 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > /* > > * Berkshire PCI-PC Watchdog Card Driver > > * > > @@ -9,15 +10,6 @@ > > * Alan Cox <alan@lxorguk.ukuu.org.uk>, > > * Matt Domsch <Matt_Domsch@dell.com>, > > * Rob Radez <rob@osinvestor.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 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. > > */ > > > > /* > > --- a/drivers/watchdog/pcwd_usb.c > > +++ b/drivers/watchdog/pcwd_usb.c > > @@ -1,3 +1,4 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > /* > > * Berkshire USB-PC Watchdog Card Driver > > * > > @@ -10,15 +11,6 @@ > > * Rob Radez <rob@osinvestor.com>, > > * Greg Kroah-Hartman <greg@kroah.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 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/ > > --- a/drivers/watchdog/sa1100_wdt.c > > +++ b/drivers/watchdog/sa1100_wdt.c > > @@ -1,18 +1,10 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > /* > > * Watchdog driver for the SA11x0/PXA2xx > > * > > * (c) Copyright 2000 Oleg Drokin <green@crimea.edu> > > * Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk> > > * > > - * 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 <green@crimea.edu> > > * > > * 27/11/2000 Initial release > > --- a/drivers/watchdog/sch311x_wdt.c > > +++ b/drivers/watchdog/sch311x_wdt.c > > @@ -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 <wim@iguana.be>. > > - * > > - * 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. > > */ > > > > /* > > --- a/drivers/watchdog/watchdog_core.c > > +++ b/drivers/watchdog/watchdog_core.c > > @@ -1,3 +1,4 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > /* > > * watchdog_core.c > > * > > @@ -15,15 +16,6 @@ > > * Rusty Lynch <rusty@linux.co.intel.com> > > * Satyam Sharma <satyam@infradead.org> > > * Randy Dunlap <randy.dunlap@oracle.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, 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 > > --- a/drivers/watchdog/watchdog_core.h > > +++ b/drivers/watchdog/watchdog_core.h > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > > /* > > * watchdog_core.h > > * > > @@ -15,15 +16,6 @@ > > * Rusty Lynch <rusty@linux.co.intel.com> > > * Satyam Sharma <satyam@infradead.org> > > * Randy Dunlap <randy.dunlap@oracle.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, 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 */ > > --- a/drivers/watchdog/watchdog_dev.c > > +++ b/drivers/watchdog/watchdog_dev.c > > @@ -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 <wim@iguana.be>. > > * > > - * > > * 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 <rusty@linux.co.intel.com> > > * Satyam Sharma <satyam@infradead.org> > > * Randy Dunlap <randy.dunlap@oracle.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, 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 > swinslow@linuxfoundation.org -- Richard Fontana Senior Commercial Counsel Red Hat, Inc. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 2019-06-06 9:53 ` [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 Thomas Gleixner 2019-06-06 12:41 ` Steve Winslow @ 2019-06-11 14:24 ` Enrico Weigelt, metux IT consult 2019-06-11 15:40 ` Greg KH 1 sibling, 1 reply; 12+ messages in thread From: Enrico Weigelt, metux IT consult @ 2019-06-11 14:24 UTC (permalink / raw) To: Thomas Gleixner, linux-spdx On 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 -- Enrico Weigelt, metux IT consult Free software and Linux embedded engineering info@metux.net -- +49-151-27565287 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 2019-06-11 14:24 ` Enrico Weigelt, metux IT consult @ 2019-06-11 15:40 ` Greg KH 2019-06-11 17:52 ` Thomas Gleixner 0 siblings, 1 reply; 12+ messages in thread From: Greg KH @ 2019-06-11 15:40 UTC (permalink / raw) To: Enrico Weigelt, metux IT consult; +Cc: Thomas Gleixner, linux-spdx On Tue, Jun 11, 2019 at 04:24:53PM +0200, Enrico Weigelt, metux IT consult wrote: > 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 :( > 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 2019-06-11 15:40 ` Greg KH @ 2019-06-11 17:52 ` Thomas Gleixner 0 siblings, 0 replies; 12+ messages in thread From: Thomas Gleixner @ 2019-06-11 17:52 UTC (permalink / raw) To: Greg KH; +Cc: Enrico Weigelt, metux IT consult, linux-spdx On Tue, 11 Jun 2019, Greg KH wrote: > On Tue, Jun 11, 2019 at 04:24:53PM +0200, Enrico Weigelt, metux IT consult wrote: > > > 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 ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-06-11 17:52 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-06-06 9:53 [COX patch 0/2] Deep review of 'COX' disclaimers Thomas Gleixner 2019-06-06 9:53 ` [COX patch 1/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 100 Thomas Gleixner 2019-06-06 12:39 ` Steve Winslow 2019-06-06 14:27 ` Richard Fontana 2019-06-06 15:14 ` Thomas Gleixner 2019-06-08 20:50 ` Allison Randal 2019-06-06 9:53 ` [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 Thomas Gleixner 2019-06-06 12:41 ` Steve Winslow 2019-06-06 14:30 ` Richard Fontana 2019-06-11 14:24 ` Enrico Weigelt, metux IT consult 2019-06-11 15:40 ` Greg KH 2019-06-11 17:52 ` Thomas Gleixner
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).