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@xxxxxxxxxxxxx> wrote: > > From: Thomas Gleixner tglx@xxxxxxxxxxxxx > > 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@xxxxxxxxxxxxx> > > --- > 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@xxxxxxxxx>. > - * > - * 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@xxxxxxxxx>. > * > - * 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@xxxxxxxxxxxxxxxxx> > * 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@xxxxxxxxxxxxxxxxxxx>, > * Matt Domsch <Matt_Domsch@xxxxxxxx>, > * Rob Radez <rob@xxxxxxxxxxxxxx> > - * > - * 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@xxxxxxxxxxxxxx>, > * Greg Kroah-Hartman <greg@xxxxxxxxx> > * > - * 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@xxxxxxxxxx> > * Based on SoftDog driver by Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> > * > - * 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@xxxxxxxxxx> > * > * 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@xxxxxxxxx>. > - * > - * 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@xxxxxxxxxxxxxxxxxx> > * Satyam Sharma <satyam@xxxxxxxxxxxxx> > * Randy Dunlap <randy.dunlap@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 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@xxxxxxxxxxxxxxxxxx> > * Satyam Sharma <satyam@xxxxxxxxxxxxx> > * Randy Dunlap <randy.dunlap@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 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@xxxxxxxxx>. > * > - * > * 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@xxxxxxxxxxxxxxxxxx> > * Satyam Sharma <satyam@xxxxxxxxxxxxx> > * Randy Dunlap <randy.dunlap@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 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@xxxxxxxxxxxxxxxxxxx
