[PATCH v3] watchdog: add SPDX identifiers for watchdog subsystem

[Winkler, Tomas]

> 
> - 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 <marcus.folkesson at gmail.com>
> Acked-by: Adam Thomson <Adam.Thomson.Opensource at diasemi.com>
> Acked-by: Charles Keepax <ckeepax at opensource.cirrus.com>
> Acked-by: Mans Rullgard <mans at mansr.com>
> Acked-by: Matthias Brugger <matthias.bgg at gmail.com>
> Acked-by: Michal Simek <michal.simek at xilinx.com>
> Acked-by: Neil Armstrong <narmstrong at baylibre.com>
> Acked-by: Nicolas Ferre <nicolas.ferre at microchip.com>
> Acked-by: Thierry Reding <treding at nvidia.com>
> Reviewed-by: Eric Anholt <eric at anholt.net>
> ---
> 
> 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 <linux/err.h>
> 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 <linux/module.h>
> @@ -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 <tomas.winkler at intel.com>