Re: [PATCH v3] watchdog: add SPDX identifiers for watchdog subsystem
Marcus Folkesson writes: > - Add SPDX identifier > - Remove boiler plate license text > - If MODULE_LICENSE and boiler plate does not match, go for boiler plate > license > > Signed-off-by: Marcus Folkesson > diff --git a/drivers/watchdog/wdrtas.c b/drivers/watchdog/wdrtas.c > index 0240c60d14e3..af07f746b7cc 100644 > --- a/drivers/watchdog/wdrtas.c > +++ b/drivers/watchdog/wdrtas.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * FIXME: add wdrtas_get_status and wdrtas_get_boot_status as soon as > * RTAS calls are available > @@ -10,20 +11,6 @@ > * device driver to exploit watchdog RTAS functions > * > * Authors : Utz Bacher > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ LGTM. Acked-by: Michael Ellerman (powerpc) cheers
Re: [PATCH v3] watchdog: add SPDX identifiers for watchdog subsystem
Marcus Folkesson writes: [...] > drivers/watchdog/mena21_wdt.c | 4 +-- For mena21_wdt: Acked-by: Johannes Thumshirn -- Johannes Thumshirn Storage jthumsh...@suse.de+49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
Re: [PATCH v3] watchdog: add SPDX identifiers for watchdog subsystem
On Wed, Feb 21, 2018 at 01:27:34PM +0100, Marcus Folkesson wrote: > - Add SPDX identifier > - Remove boiler plate license text > - If MODULE_LICENSE and boiler plate does not match, go for boiler plate > license [...] > drivers/watchdog/mena21_wdt.c | 4 +-- Acked-by: Johannes Thumshirn -- Johannes Thumshirn Storage jthumsh...@suse.de+49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
RE: [PATCH v3] watchdog: add SPDX identifiers for watchdog subsystem
>
> - Add SPDX identifier
> - Remove boiler plate license text
> - If MODULE_LICENSE and boiler plate does not match, go for boiler plate
> license
>
> Signed-off-by: Marcus Folkesson
> Acked-by: Adam Thomson
> Acked-by: Charles Keepax
> Acked-by: Mans Rullgard
> Acked-by: Matthias Brugger
> Acked-by: Michal Simek
> Acked-by: Neil Armstrong
> Acked-by: Nicolas Ferre
> Acked-by: Thierry Reding
> Reviewed-by: Eric Anholt
> ---
>
> Notes:
> v3:
> - Keep license text for ebc-c384_wdt
> v2:
> - Put back removed copyright texts for meson_gxbb_wdt and
> coh901327_wdt
> - Change to BSD-3-Clause for meson_gxbb_wdt
> v1: Please have an extra look at meson_gxbb_wdt.c
>
> *
> - * 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.
> *
>
> #include
> diff --git a/drivers/watchdog/mei_wdt.c b/drivers/watchdog/mei_wdt.c
> index b8194b02abe0..8023cf28657a 100644
> --- a/drivers/watchdog/mei_wdt.c
> +++ b/drivers/watchdog/mei_wdt.c
> @@ -1,15 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * Intel Management Engine Interface (Intel MEI) Linux driver
> * Copyright (c) 2015, Intel Corporation.
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU General Public License,
> - * version 2, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope 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
> @@ -687,5 +679,5 @@ static struct mei_cl_driver mei_wdt_driver = {
> module_mei_cl_driver(mei_wdt_driver);
>
> MODULE_AUTHOR("Intel Corporation");
> -MODULE_LICENSE("GPL");
> +MODULE_LICENSE("GPL v2");
> MODULE_DESCRIPTION("Device driver for Intel MEI iAMT watchdog");
Acked-by: Tomas Winkler
Re: [PATCH v3] watchdog: add SPDX identifiers for watchdog subsystem
HI Marcus On 02/21/2018 01:27 PM, Marcus Folkesson wrote: > - Add SPDX identifier > - Remove boiler plate license text > - If MODULE_LICENSE and boiler plate does not match, go for boiler plate >license > > Signed-off-by: Marcus Folkesson > Acked-by: Adam Thomson > Acked-by: Charles Keepax > Acked-by: Mans Rullgard > Acked-by: Matthias Brugger > Acked-by: Michal Simek > Acked-by: Neil Armstrong > Acked-by: Nicolas Ferre > Acked-by: Thierry Reding > Reviewed-by: Eric Anholt > --- > > Notes: > v3: > - Keep license text for ebc-c384_wdt > v2: > - Put back removed copyright texts for meson_gxbb_wdt and coh901327_wdt > - Change to BSD-3-Clause for meson_gxbb_wdt > v1: Please have an extra look at meson_gxbb_wdt.c > [...] > diff --git a/drivers/watchdog/st_lpc_wdt.c b/drivers/watchdog/st_lpc_wdt.c > index e6100e447dd8..177829b379da 100644 > --- a/drivers/watchdog/st_lpc_wdt.c > +++ b/drivers/watchdog/st_lpc_wdt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* >* ST's LPC Watchdog >* > @@ -5,11 +6,6 @@ >* >* Author: David Paris for STMicroelectronics >* Lee Jones for STMicroelectronics > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public Licence > - * as published by the Free Software Foundation; either version > - * 2 of the Licence, or (at your option) any later version. >*/ > For st_lpc_wdt.c Acked-by: Patrice Chotard Thanks
Re: [PATCH v3] watchdog: add SPDX identifiers for watchdog subsystem
Hi Marcus,
On Wed, Feb 21, 2018 at 01:27:34PM +0100, Marcus Folkesson wrote:
> - Add SPDX identifier
> - Remove boiler plate license text
> - If MODULE_LICENSE and boiler plate does not match, go for boiler plate
> license
>
> Signed-off-by: Marcus Folkesson
> Acked-by: Adam Thomson
> Acked-by: Charles Keepax
> Acked-by: Mans Rullgard
> Acked-by: Matthias Brugger
> Acked-by: Michal Simek
> Acked-by: Neil Armstrong
> Acked-by: Nicolas Ferre
> Acked-by: Thierry Reding
> Reviewed-by: Eric Anholt
[...]
> diff --git a/drivers/watchdog/digicolor_wdt.c
> b/drivers/watchdog/digicolor_wdt.c
> index 5e4ef93caa02..a9e11df155b8 100644
> --- a/drivers/watchdog/digicolor_wdt.c
> +++ b/drivers/watchdog/digicolor_wdt.c
> @@ -1,12 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> * Watchdog driver for Conexant Digicolor
> *
> * Copyright (C) 2015 Paradox Innovation Ltd.
> *
> - * 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.
> */
For digicolor_wdt.c:
Acked-by: Baruch Siach
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}ooO--U--Ooo{=
- bar...@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
Re: [PATCH v3] watchdog: add SPDX identifiers for watchdog subsystem
On Wed, Feb 21, 2018 at 01:27:34PM +0100, Marcus Folkesson wrote: >- Add SPDX identifier >- Remove boiler plate license text >- If MODULE_LICENSE and boiler plate does not match, go for boiler plate > license > >Signed-off-by: Marcus Folkesson >Acked-by: Adam Thomson >Acked-by: Charles Keepax >Acked-by: Mans Rullgard >Acked-by: Matthias Brugger >Acked-by: Michal Simek >Acked-by: Neil Armstrong >Acked-by: Nicolas Ferre >Acked-by: Thierry Reding >Reviewed-by: Eric Anholt >--- > >Notes: >v3: > - Keep license text for ebc-c384_wdt >v2: > - Put back removed copyright texts for meson_gxbb_wdt and coh901327_wdt > - Change to BSD-3-Clause for meson_gxbb_wdt >v1: Please have an extra look at meson_gxbb_wdt.c [...] >diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c >index 2170b275ea01..4c4c8ce78021 100644 >--- a/drivers/watchdog/ebc-c384_wdt.c >+++ b/drivers/watchdog/ebc-c384_wdt.c >@@ -1,3 +1,4 @@ >+// SPDX-License-Identifier: GPL-2.0 > /* > * Watchdog timer driver for the WinSystems EBC-C384 > * Copyright (C) 2016 William Breathitt Gray For ebc-c384_wdt.c, Acked-by: William Breathitt Gray William Breathitt Gray
