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@xxxxxxxxxxxxx> wrote: > > From: Thomas Gleixner tglx@xxxxxxxxxxxxx > > 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@xxxxxxxxxxxxx> > > --- > 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@xxxxxxxxxx>, 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@xxxxxxxxxxxxxxxxxxx> > * > * 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@xxxxxxxxxxxxxxxxxxx>, > * 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@xxxxxxxxxxxxxxxxxxx> > * > * 14-Dec-2001 Matt Domsch <Matt_Domsch@xxxxxxxx> > --- 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@xxxxxxxxxxxxxxxxxxx>, > * 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@xxxxxxxxxxxxxxxxxxx> > * > * 14-Dec-2001 Matt Domsch <Matt_Domsch@xxxxxxxx> > --- 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@xxxxxxxxxxxxxxxxxxx>, > * 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@xxxxxxxxxxxxxxxxxxx>* > */ > > --- 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@xxxxxxxxxxxxxxxxxxx>, > * 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@xxxxxxxxxxxxxxxxxxx> > * > * 14-Dec-2001 Matt Domsch <Matt_Domsch@xxxxxxxx> > * 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@xxxxxxxxxx> > * and Marcus Junker, <junker@xxxxxxxxxx> > * > - * 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@xxxxxxxxxxxxxxxxxxx>, > * 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@xxxxxxxxxxxxxxxxxxx> > * > * 14-Dec-2001 Matt Domsch <Matt_Domsch@xxxxxxxx> > * 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@xxxxxxxxxxxxxxxxxxx>, > * 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@xxxxxxxxxxxxxxxxxxx> > * > * 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@xxxxxxxxxxxxxxxxxxx>, > * 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@xxxxxxxxxxxxxxxxxxx> > */ > > --- 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@xxxxxxxxxxxxxxxxxxx>, > * 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@xxxxxxxxxxxxxxxxxxx> > - * > */ > > #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@xxxxxxxxxxxxxxxxxxx>, > * 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@xxxxxxxxxxxxxxxxxxx> > * > * 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@xxxxxxxxxxxxxxxxxxx>, > * 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@xxxxxxxxxxxxxxxxxxx> > * > * Release 0.10. > > -- Steve Winslow Director of Strategic Programs The Linux Foundation swinslow@xxxxxxxxxxxxxxxxxxx
