Re: [PATCH] watchdog: convert remaining drivers to use SPDX license identifier
On Thu, Jun 20, 2019 at 09:28:46AM -0700, Guenter Roeck wrote: > This gets rid of the unnecessary license boilerplate, and avoids > having to deal with individual patches one by one. > > No functional changes. > > Signed-off-by: Guenter Roeck > --- > Note: Several drivers include a paragraph such as > > "Neither nor admit liability nor > provide warranty for any of this software. This material is > provided "AS-IS" and at no charge." > > Presumably this is covered by the GPL license. However, since I am not > an attorney, I am not sure, and I opted for leaving such paragraphs in > place. [...] > drivers/watchdog/ebc-c384_wdt.c| 9 - [...] > diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c > index c176f59fea28..8ef4b0df3855 100644 > --- a/drivers/watchdog/ebc-c384_wdt.c > +++ b/drivers/watchdog/ebc-c384_wdt.c > @@ -2,15 +2,6 @@ > /* > * Watchdog timer driver for the WinSystems EBC-C384 > * Copyright (C) 2016 William Breathitt Gray > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License, version 2, as > - * published by the Free Software Foundation. > - * > - * This program is distributed in the hope that it will be useful, but > - * WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * General Public License for more details. > */ > #include > #include Acked-by: William Breathitt Gray
Re: [PATCH] watchdog: convert remaining drivers to use SPDX license identifier
On 20/06/2019 18:28, Guenter Roeck wrote: > This gets rid of the unnecessary license boilerplate, and avoids > having to deal with individual patches one by one. > > No functional changes. > > Signed-off-by: Guenter Roeck > --- > Note: Several drivers include a paragraph such as > > "Neither nor admit liability nor > provide warranty for any of this software. This material is > provided "AS-IS" and at no charge." > > Presumably this is covered by the GPL license. However, since I am not > an attorney, I am not sure, and I opted for leaving such paragraphs in > place. > > drivers/watchdog/acquirewdt.c | 6 +- > drivers/watchdog/advantechwdt.c| 6 +- > drivers/watchdog/ath79_wdt.c | 6 +- > drivers/watchdog/davinci_wdt.c | 6 ++ > drivers/watchdog/ebc-c384_wdt.c| 9 - > drivers/watchdog/eurotechwdt.c | 6 +- > drivers/watchdog/ftwdt010_wdt.c| 5 + > drivers/watchdog/hpwdt.c | 6 +- > drivers/watchdog/iTCO_vendor_support.c | 7 +-- > drivers/watchdog/iTCO_wdt.c| 6 +- > drivers/watchdog/ib700wdt.c| 6 +- > drivers/watchdog/ie6xx_wdt.c | 17 + > drivers/watchdog/imgpdc_wdt.c | 5 + > drivers/watchdog/intel_scu_watchdog.c | 19 +-- > drivers/watchdog/intel_scu_watchdog.h | 17 + > drivers/watchdog/iop_wdt.c | 14 +- > drivers/watchdog/kempld_wdt.c | 10 +- > drivers/watchdog/ks8695_wdt.c | 5 + > drivers/watchdog/lantiq_wdt.c | 5 + > drivers/watchdog/lpc18xx_wdt.c | 5 + > drivers/watchdog/max77620_wdt.c| 5 + > drivers/watchdog/mt7621_wdt.c | 5 + for mt7621_wdt.c Reviewed-by: Matthias Brugger
Re: [PATCH] watchdog: convert remaining drivers to use SPDX license identifier
On Thu, Jun 20, 2019 at 1:07 PM Jerry Hoemann wrote: > > On Thu, Jun 20, 2019 at 09:28:46AM -0700, Guenter Roeck wrote: > > This gets rid of the unnecessary license boilerplate, and avoids > > having to deal with individual patches one by one. > > > > No functional changes. > > > > Signed-off-by: Guenter Roeck > > --- > > Note: Several drivers include a paragraph such as > > > > "Neither nor admit liability nor > > provide warranty for any of this software. This material is > > provided "AS-IS" and at no charge." > > > > Presumably this is covered by the GPL license. However, since I am not > > an attorney, I am not sure, and I opted for leaving such paragraphs in > > place. > > [...] > > drivers/watchdog/pnx4008_wdt.c | 5 + [...] > > 51 files changed, 54 insertions(+), 336 deletions(-) > > [...] For pnx4008_wdt.c: Acked-by: Sylvain Lemieux
Re: [PATCH] watchdog: convert remaining drivers to use SPDX license identifier
On Thu, Jun 20, 2019 at 09:28:46AM -0700, Guenter Roeck wrote: > This gets rid of the unnecessary license boilerplate, and avoids > having to deal with individual patches one by one. > > No functional changes. > > Signed-off-by: Guenter Roeck > --- > Note: Several drivers include a paragraph such as > > "Neither nor admit liability nor > provide warranty for any of this software. This material is > provided "AS-IS" and at no charge." > > Presumably this is covered by the GPL license. However, since I am not > an attorney, I am not sure, and I opted for leaving such paragraphs in > place. > For hpwdt.c changes: Reviewed-by: Jerry Hoemann > drivers/watchdog/acquirewdt.c | 6 +- > drivers/watchdog/advantechwdt.c| 6 +- > drivers/watchdog/ath79_wdt.c | 6 +- > drivers/watchdog/davinci_wdt.c | 6 ++ > drivers/watchdog/ebc-c384_wdt.c| 9 - > drivers/watchdog/eurotechwdt.c | 6 +- > drivers/watchdog/ftwdt010_wdt.c| 5 + > drivers/watchdog/hpwdt.c | 6 +- > drivers/watchdog/iTCO_vendor_support.c | 7 +-- > drivers/watchdog/iTCO_wdt.c| 6 +- > drivers/watchdog/ib700wdt.c| 6 +- > drivers/watchdog/ie6xx_wdt.c | 17 + > drivers/watchdog/imgpdc_wdt.c | 5 + > drivers/watchdog/intel_scu_watchdog.c | 19 +-- > drivers/watchdog/intel_scu_watchdog.h | 17 + > drivers/watchdog/iop_wdt.c | 14 +- > drivers/watchdog/kempld_wdt.c | 10 +- > drivers/watchdog/ks8695_wdt.c | 5 + > drivers/watchdog/lantiq_wdt.c | 5 + > drivers/watchdog/lpc18xx_wdt.c | 5 + > drivers/watchdog/max77620_wdt.c| 5 + > drivers/watchdog/mt7621_wdt.c | 5 + > drivers/watchdog/mv64x60_wdt.c | 6 ++ > drivers/watchdog/nuc900_wdt.c | 6 +- > drivers/watchdog/nv_tco.h | 6 +- > drivers/watchdog/octeon-wdt-main.c | 11 +-- > drivers/watchdog/omap_wdt.c| 6 ++ > drivers/watchdog/omap_wdt.h| 21 + > drivers/watchdog/pc87413_wdt.c | 6 +- > drivers/watchdog/pcwd_pci.c| 6 +- > drivers/watchdog/pcwd_usb.c| 6 +- > drivers/watchdog/pnx4008_wdt.c | 5 + > drivers/watchdog/qcom-wdt.c| 14 ++ > drivers/watchdog/retu_wdt.c| 10 +- > drivers/watchdog/rn5t618_wdt.c | 8 +--- > drivers/watchdog/rt2880_wdt.c | 5 + > drivers/watchdog/sa1100_wdt.c | 6 +- > drivers/watchdog/sbc7240_wdt.c | 11 +-- > drivers/watchdog/sbc8360.c | 6 +- > drivers/watchdog/sbsa_gwdt.c | 10 +- > drivers/watchdog/sch311x_wdt.c | 6 +- > drivers/watchdog/softdog.c | 6 +- > drivers/watchdog/txx9wdt.c | 5 + > drivers/watchdog/w83627hf_wdt.c| 6 +- > drivers/watchdog/wafer5823wdt.c| 6 +- > drivers/watchdog/watchdog_core.c | 6 +- > drivers/watchdog/watchdog_core.h | 6 +- > drivers/watchdog/watchdog_dev.c| 6 +- > drivers/watchdog/wd501p.h | 6 +- > drivers/watchdog/wdt.c | 6 +- > drivers/watchdog/wdt_pci.c | 6 +- > 51 files changed, 54 insertions(+), 336 deletions(-) > > diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c > index 957d1255d4ca..848db958411e 100644 > --- a/drivers/watchdog/acquirewdt.c > +++ b/drivers/watchdog/acquirewdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Acquire Single Board Computer Watchdog Timer driver > * > @@ -6,11 +7,6 @@ > * (c) Copyright 1996 Alan Cox , > * 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. > diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c > index 2766af292a71..0d02bb275b3d 100644 > --- a/drivers/watchdog/advantechwdt.c > +++ b/drivers/watchdog/advantechwdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Advantech Single Board Computer WDT driver > * > @@ -9,11 +10,6 @@ > * (c) Copyright 1996 Alan Cox , > * All Rights Reserved. > * > - * This program is free software; you can redistribute it and/or > -
[PATCH] watchdog: convert remaining drivers to use SPDX license identifier
This gets rid of the unnecessary license boilerplate, and avoids having to deal with individual patches one by one. No functional changes. Signed-off-by: Guenter Roeck --- Note: Several drivers include a paragraph such as "Neither nor admit liability nor provide warranty for any of this software. This material is provided "AS-IS" and at no charge." Presumably this is covered by the GPL license. However, since I am not an attorney, I am not sure, and I opted for leaving such paragraphs in place. drivers/watchdog/acquirewdt.c | 6 +- drivers/watchdog/advantechwdt.c| 6 +- drivers/watchdog/ath79_wdt.c | 6 +- drivers/watchdog/davinci_wdt.c | 6 ++ drivers/watchdog/ebc-c384_wdt.c| 9 - drivers/watchdog/eurotechwdt.c | 6 +- drivers/watchdog/ftwdt010_wdt.c| 5 + drivers/watchdog/hpwdt.c | 6 +- drivers/watchdog/iTCO_vendor_support.c | 7 +-- drivers/watchdog/iTCO_wdt.c| 6 +- drivers/watchdog/ib700wdt.c| 6 +- drivers/watchdog/ie6xx_wdt.c | 17 + drivers/watchdog/imgpdc_wdt.c | 5 + drivers/watchdog/intel_scu_watchdog.c | 19 +-- drivers/watchdog/intel_scu_watchdog.h | 17 + drivers/watchdog/iop_wdt.c | 14 +- drivers/watchdog/kempld_wdt.c | 10 +- drivers/watchdog/ks8695_wdt.c | 5 + drivers/watchdog/lantiq_wdt.c | 5 + drivers/watchdog/lpc18xx_wdt.c | 5 + drivers/watchdog/max77620_wdt.c| 5 + drivers/watchdog/mt7621_wdt.c | 5 + drivers/watchdog/mv64x60_wdt.c | 6 ++ drivers/watchdog/nuc900_wdt.c | 6 +- drivers/watchdog/nv_tco.h | 6 +- drivers/watchdog/octeon-wdt-main.c | 11 +-- drivers/watchdog/omap_wdt.c| 6 ++ drivers/watchdog/omap_wdt.h| 21 + drivers/watchdog/pc87413_wdt.c | 6 +- drivers/watchdog/pcwd_pci.c| 6 +- drivers/watchdog/pcwd_usb.c| 6 +- drivers/watchdog/pnx4008_wdt.c | 5 + drivers/watchdog/qcom-wdt.c| 14 ++ drivers/watchdog/retu_wdt.c| 10 +- drivers/watchdog/rn5t618_wdt.c | 8 +--- drivers/watchdog/rt2880_wdt.c | 5 + drivers/watchdog/sa1100_wdt.c | 6 +- drivers/watchdog/sbc7240_wdt.c | 11 +-- drivers/watchdog/sbc8360.c | 6 +- drivers/watchdog/sbsa_gwdt.c | 10 +- drivers/watchdog/sch311x_wdt.c | 6 +- drivers/watchdog/softdog.c | 6 +- drivers/watchdog/txx9wdt.c | 5 + drivers/watchdog/w83627hf_wdt.c| 6 +- drivers/watchdog/wafer5823wdt.c| 6 +- drivers/watchdog/watchdog_core.c | 6 +- drivers/watchdog/watchdog_core.h | 6 +- drivers/watchdog/watchdog_dev.c| 6 +- drivers/watchdog/wd501p.h | 6 +- drivers/watchdog/wdt.c | 6 +- drivers/watchdog/wdt_pci.c | 6 +- 51 files changed, 54 insertions(+), 336 deletions(-) diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c index 957d1255d4ca..848db958411e 100644 --- a/drivers/watchdog/acquirewdt.c +++ b/drivers/watchdog/acquirewdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Acquire Single Board Computer Watchdog Timer driver * @@ -6,11 +7,6 @@ * (c) Copyright 1996 Alan Cox , * 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. diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c index 2766af292a71..0d02bb275b3d 100644 --- a/drivers/watchdog/advantechwdt.c +++ b/drivers/watchdog/advantechwdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Advantech Single Board Computer WDT driver * @@ -9,11 +10,6 @@ * (c) Copyright 1996 Alan Cox , * 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
