From: marcus.folkesson@gmail.com (Marcus Folkesson)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH] watchdog: add SPDX identifiers for watchdog subsystem
Date: Tue, 20 Feb 2018 10:59:26 +0100 [thread overview]
Message-ID: <20180220095811.GA24311@gmail.com> (raw)
In-Reply-To: <d734dd84-ad3b-141b-779d-13d340217a18@baylibre.com>
On Tue, Feb 20, 2018 at 10:47:03AM +0100, Neil Armstrong wrote:
> Hi Marcus,
>
> On 20/02/2018 10:31, 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 <marcus.folkesson@gmail.com>
> > ---
> >
> > Notes:
> > v1: Please have an extra look at meson_gxbb_wdt.c
> >
> > drivers/watchdog/acquirewdt.c | 6 +---
> > drivers/watchdog/advantechwdt.c | 6 +---
> > drivers/watchdog/alim1535_wdt.c | 6 +---
> > drivers/watchdog/alim7101_wdt.c | 1 +
> > drivers/watchdog/ar7_wdt.c | 14 +--------
> > drivers/watchdog/asm9260_wdt.c | 2 +-
> > drivers/watchdog/aspeed_wdt.c | 5 +---
> > drivers/watchdog/at91rm9200_wdt.c | 5 +---
> > drivers/watchdog/at91sam9_wdt.c | 5 +---
> > drivers/watchdog/at91sam9_wdt.h | 5 +---
> > drivers/watchdog/ath79_wdt.c | 4 +--
> > drivers/watchdog/atlas7_wdt.c | 2 +-
> > drivers/watchdog/bcm2835_wdt.c | 5 +---
> > drivers/watchdog/bcm47xx_wdt.c | 5 +---
> > drivers/watchdog/bcm63xx_wdt.c | 5 +---
> > drivers/watchdog/bcm7038_wdt.c | 12 ++------
> > drivers/watchdog/bcm_kona_wdt.c | 9 +-----
> > drivers/watchdog/bfin_wdt.c | 2 +-
> > drivers/watchdog/booke_wdt.c | 5 +---
> > drivers/watchdog/cadence_wdt.c | 5 +---
> > drivers/watchdog/coh901327_wdt.c | 7 ++---
> > drivers/watchdog/cpu5wdt.c | 15 +---------
> > drivers/watchdog/cpwd.c | 1 +
> > drivers/watchdog/da9052_wdt.c | 6 +---
> > drivers/watchdog/da9055_wdt.c | 6 +---
> > drivers/watchdog/da9062_wdt.c | 10 +------
> > drivers/watchdog/da9063_wdt.c | 5 +---
> > drivers/watchdog/davinci_wdt.c | 7 ++---
> > drivers/watchdog/diag288_wdt.c | 1 +
> > drivers/watchdog/digicolor_wdt.c | 5 +---
> > drivers/watchdog/dw_wdt.c | 6 +---
> > drivers/watchdog/ebc-c384_wdt.c | 9 +-----
> > drivers/watchdog/ep93xx_wdt.c | 7 ++---
> > drivers/watchdog/eurotechwdt.c | 6 +---
> > drivers/watchdog/f71808e_wdt.c | 16 +---------
> > drivers/watchdog/ftwdt010_wdt.c | 6 ++--
> > drivers/watchdog/gef_wdt.c | 6 +---
> > drivers/watchdog/geodewdt.c | 5 +---
> > drivers/watchdog/gpio_wdt.c | 5 +---
> > drivers/watchdog/hpwdt.c | 7 ++---
> > drivers/watchdog/i6300esb.c | 6 +---
> > drivers/watchdog/iTCO_vendor_support.c | 9 +-----
> > drivers/watchdog/iTCO_wdt.c | 10 +------
> > drivers/watchdog/ib700wdt.c | 6 +---
> > drivers/watchdog/ibmasr.c | 3 +-
> > drivers/watchdog/ie6xx_wdt.c | 18 ++---------
> > drivers/watchdog/imgpdc_wdt.c | 5 +---
> > drivers/watchdog/imx2_wdt.c | 5 +---
> > drivers/watchdog/indydog.c | 6 +---
> > drivers/watchdog/intel-mid_wdt.c | 6 ++--
> > drivers/watchdog/intel_scu_watchdog.c | 18 ++---------
> > drivers/watchdog/intel_scu_watchdog.h | 16 +---------
> > drivers/watchdog/iop_wdt.c | 16 ++--------
> > drivers/watchdog/it8712f_wdt.c | 10 +------
> > drivers/watchdog/it87_wdt.c | 10 +------
> > drivers/watchdog/ixp4xx_wdt.c | 6 ++--
> > drivers/watchdog/jz4740_wdt.c | 10 +------
> > drivers/watchdog/kempld_wdt.c | 12 ++------
> > drivers/watchdog/ks8695_wdt.c | 6 ++--
> > drivers/watchdog/lantiq_wdt.c | 7 ++---
> > drivers/watchdog/loongson1_wdt.c | 5 +---
> > drivers/watchdog/lpc18xx_wdt.c | 5 +---
> > drivers/watchdog/m54xx_wdt.c | 6 ++--
> > drivers/watchdog/machzwd.c | 11 +------
> > drivers/watchdog/max63xx_wdt.c | 5 +---
> > drivers/watchdog/max77620_wdt.c | 5 +---
> > drivers/watchdog/mei_wdt.c | 12 ++------
> > drivers/watchdog/mena21_wdt.c | 4 +--
> > drivers/watchdog/menf21bmc_wdt.c | 8 ++---
> > drivers/watchdog/meson_gxbb_wdt.c | 55 +---------------------------------
> > drivers/watchdog/meson_wdt.c | 6 +---
> > drivers/watchdog/mixcomwd.c | 6 +---
> > drivers/watchdog/moxart_wdt.c | 7 ++---
> > drivers/watchdog/mpc8xxx_wdt.c | 6 +---
> > drivers/watchdog/mt7621_wdt.c | 5 +---
> > drivers/watchdog/mtk_wdt.c | 11 +------
> > drivers/watchdog/mtx-1_wdt.c | 11 +------
> > drivers/watchdog/mv64x60_wdt.c | 6 ++--
> > drivers/watchdog/ni903x_wdt.c | 11 +------
> > drivers/watchdog/nic7018_wdt.c | 11 +------
> > drivers/watchdog/nuc900_wdt.c | 7 ++---
> > drivers/watchdog/nv_tco.c | 6 +---
> > drivers/watchdog/nv_tco.h | 10 +------
> > drivers/watchdog/octeon-wdt-main.c | 11 +------
> > drivers/watchdog/octeon-wdt-nmi.S | 5 +---
> > drivers/watchdog/of_xilinx_wdt.c | 8 ++---
> > drivers/watchdog/omap_wdt.c | 1 +
> > drivers/watchdog/omap_wdt.h | 21 +------------
> > drivers/watchdog/orion_wdt.c | 5 +---
> > drivers/watchdog/pc87413_wdt.c | 10 +------
> > drivers/watchdog/pcwd.c | 1 +
> > drivers/watchdog/pcwd_pci.c | 10 +------
> > drivers/watchdog/pcwd_usb.c | 10 +------
> > drivers/watchdog/pic32-dmt.c | 5 +---
> > drivers/watchdog/pic32-wdt.c | 6 +---
> > drivers/watchdog/pika_wdt.c | 1 +
> > drivers/watchdog/pnx4008_wdt.c | 7 ++---
> > drivers/watchdog/pnx833x_wdt.c | 6 +---
> > drivers/watchdog/pretimeout_noop.c | 7 +----
> > drivers/watchdog/pretimeout_panic.c | 7 +----
> > drivers/watchdog/qcom-wdt.c | 14 ++-------
> > drivers/watchdog/renesas_wdt.c | 4 +--
> > drivers/watchdog/retu_wdt.c | 10 +------
> > drivers/watchdog/riowd.c | 1 +
> > drivers/watchdog/rn5t618_wdt.c | 8 +----
> > drivers/watchdog/rt2880_wdt.c | 5 +---
> > drivers/watchdog/rtd119x_wdt.c | 2 +-
> > drivers/watchdog/rza_wdt.c | 5 +---
> > drivers/watchdog/s3c2410_wdt.c | 11 +------
> > drivers/watchdog/sa1100_wdt.c | 11 +------
> > drivers/watchdog/sama5d4_wdt.c | 3 +-
> > drivers/watchdog/sb_wdog.c | 5 +---
> > drivers/watchdog/sbc60xxwdt.c | 10 +------
> > drivers/watchdog/sbc7240_wdt.c | 12 ++------
> > drivers/watchdog/sbc8360.c | 10 +------
> > drivers/watchdog/sbc_epx_c3.c | 6 +---
> > drivers/watchdog/sbc_fitpc2_wdt.c | 7 ++---
> > drivers/watchdog/sbsa_gwdt.c | 10 +------
> > drivers/watchdog/sc1200wdt.c | 10 +------
> > drivers/watchdog/sc520_wdt.c | 10 +------
> > drivers/watchdog/sch311x_wdt.c | 10 +------
> > drivers/watchdog/scx200_wdt.c | 10 ++-----
> > drivers/watchdog/shwdt.c | 6 +---
> > drivers/watchdog/sirfsoc_wdt.c | 5 ++--
> > drivers/watchdog/smsc37b787_wdt.c | 10 +------
> > drivers/watchdog/softdog.c | 10 +------
> > drivers/watchdog/sp5100_tco.c | 6 +---
> > drivers/watchdog/sp805_wdt.c | 5 +---
> > drivers/watchdog/sprd_wdt.c | 10 +------
> > drivers/watchdog/st_lpc_wdt.c | 6 +---
> > drivers/watchdog/stmp3xxx_rtc_wdt.c | 5 +---
> > drivers/watchdog/sun4v_wdt.c | 6 +---
> > drivers/watchdog/sunxi_wdt.c | 6 +---
> > drivers/watchdog/tangox_wdt.c | 6 +---
> > drivers/watchdog/tegra_wdt.c | 10 +------
> > drivers/watchdog/ts4800_wdt.c | 5 +---
> > drivers/watchdog/ts72xx_wdt.c | 7 ++---
> > drivers/watchdog/twl4030_wdt.c | 15 +---------
> > drivers/watchdog/txx9wdt.c | 9 ++----
> > drivers/watchdog/uniphier_wdt.c | 10 +------
> > drivers/watchdog/ux500_wdt.c | 5 ++--
> > drivers/watchdog/via_wdt.c | 4 +--
> > drivers/watchdog/w83627hf_wdt.c | 10 +------
> > drivers/watchdog/w83877f_wdt.c | 10 +------
> > drivers/watchdog/w83977f_wdt.c | 9 +-----
> > drivers/watchdog/wafer5823wdt.c | 11 +------
> > drivers/watchdog/watchdog_core.c | 10 +------
> > drivers/watchdog/watchdog_core.h | 10 +------
> > drivers/watchdog/watchdog_dev.c | 10 +------
> > drivers/watchdog/watchdog_pretimeout.c | 6 +---
> > drivers/watchdog/wd501p.h | 1 +
> > drivers/watchdog/wdat_wdt.c | 5 +---
> > drivers/watchdog/wdrtas.c | 15 +---------
> > drivers/watchdog/wdt.c | 11 +------
> > drivers/watchdog/wdt285.c | 7 +----
> > drivers/watchdog/wdt977.c | 8 +----
> > drivers/watchdog/wdt_pci.c | 11 +------
> > drivers/watchdog/wm831x_wdt.c | 5 +---
> > drivers/watchdog/wm8350_wdt.c | 5 +---
> > drivers/watchdog/xen_wdt.c | 6 +---
> > drivers/watchdog/ziirave_wdt.c | 11 +------
> > drivers/watchdog/zx2967_wdt.c | 3 +-
> > 162 files changed, 195 insertions(+), 1059 deletions(-)
> >
>
> [..]
>
> > diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c
> > index 69a5a57f1446..500463c3e040 100644
> > --- a/drivers/watchdog/meson_gxbb_wdt.c
> > +++ b/drivers/watchdog/meson_gxbb_wdt.c
> > @@ -1,57 +1,4 @@
> > -/*
> > - * This file is provided under a dual BSD/GPLv2 license. When using or
> > - * redistributing this file, you may do so under either license.
> > - *
> > - * GPL LICENSE SUMMARY
> > - *
> > - * Copyright (c) 2016 BayLibre, SAS.
> > - * Author: Neil Armstrong <narmstrong@baylibre.com>
>
> Please keep the copyright !
Sorry Neil!
I will fix that for v2.
I saw that the copyright text has magically disappered for
coh901327_wdt.c as well.
What do you think about the BSD license? Is BSD-2-Clause right?
>
> > - *
> > - * This program is free software; you can redistribute it and/or modify
> > - * it under the terms of version 2 of the GNU General Public License 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.
> > - *
> > - * You should have received a copy of the GNU General Public License
> > - * along with this program; if not, see <http://www.gnu.org/licenses/>.
> > - * The full GNU General Public License is included in this distribution
> > - * in the file called COPYING.
> > - *
> > - * BSD LICENSE
> > - *
> > - * Copyright (c) 2016 BayLibre, SAS.
> > - * Author: Neil Armstrong <narmstrong@baylibre.com>
> > - *
> > - * Redistribution and use in source and binary forms, with or without
> > - * modification, are permitted provided that the following conditions
> > - * are met:
> > - *
> > - * * Redistributions of source code must retain the above copyright
> > - * notice, this list of conditions and the following disclaimer.
> > - * * Redistributions in binary form must reproduce the above copyright
> > - * notice, this list of conditions and the following disclaimer in
> > - * the documentation and/or other materials provided with the
> > - * distribution.
> > - * * Neither the name of Intel Corporation nor the names of its
> > - * contributors may be used to endorse or promote products derived
> > - * from this software without specific prior written permission.
> > - *
> > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> > - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> > - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> > - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> > - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> > - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> > - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> > - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> > - */
> > +// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
> > #include <linux/clk.h>
> > #include <linux/err.h>
> > #include <linux/io.h>
> [..]
>
> Thanks,
> Neil
Best regards
Marcus Folkesson
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-amlogic/attachments/20180220/38726689/attachment.sig>
WARNING: multiple messages have this Message-ID (diff)
From: Marcus Folkesson <marcus.folkesson@gmail.com>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>, Joel Stanley <joel@jms.id.au>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Ray Jui <rjui@broadcom.com>,
Scott Branden <sbranden@broadcom.com>,
bcm-kernel-feedback-list@broadcom.com,
Eric Anholt <eric@anholt.net>,
Stefan Wahren <stefan.wahren@i2se.com>,
Linus Walleij <linus.walleij@linaro.org>,
Support Opensource <support.opensource@diasemi.com>,
Baruch Siach <baruch@tkos.co.il>,
William Breathitt Gray <vilhelm.gray@gmail.com>,
Jimmy Vance <jimmy.vance@hpe.com>,
Keguang Zhang <keguang.zhang@gmail.com>,
Joachim Eastwood <manabian@gmail.com>,
Tomas Winkler <tomas.winkler@intel.com>,
Johannes Thumshirn <morbidrsa@gmail.com>,
Andreas Werner <andreas.werner@men.de>,
Carlo Caione <carlo@caione.org>,
Kevin Hilman <khilman@baylibre.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Wan ZongShun <mcuos.com@gmail.com>,
Michal Simek <michal.simek@xilinx.com>,
Vladimir Zapolskiy <vz@mleia.com>,
Sylvain Lemieux <slemieux.tyco@gmail.com>,
Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Zwane Mwaikambo <zwanem@gmail.com>,
Jim Cromie <jim.cromie@gmail.com>, Barry Song <baohua@kernel.org>,
Patrice Chotard <patrice.chotard@st.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>,
Marc Gonzalez <marc.w.gonzalez@free.fr>,
Mans Rullgard <mans@mansr.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Jun Nie <jun.nie@linaro.org>, Baoyou Xie <baoyou.xie@linaro.org>,
Shawn Guo <shawnguo@kernel.org>,
linux-mips@linux-mips.org, linux-samsung-soc@vger.kernel.org,
linux-watchdog@vger.kernel.org, patches@opensource.cirrus.com,
adi-buildroot-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org,
linux-rpi-kernel@lists.infradead.org,
linux-tegra@vger.kernel.org, linux-amlogic@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] watchdog: add SPDX identifiers for watchdog subsystem
Date: Tue, 20 Feb 2018 10:59:26 +0100 [thread overview]
Message-ID: <20180220095811.GA24311@gmail.com> (raw)
In-Reply-To: <d734dd84-ad3b-141b-779d-13d340217a18@baylibre.com>
[-- Attachment #1: Type: text/plain, Size: 13268 bytes --]
On Tue, Feb 20, 2018 at 10:47:03AM +0100, Neil Armstrong wrote:
> Hi Marcus,
>
> On 20/02/2018 10:31, 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 <marcus.folkesson@gmail.com>
> > ---
> >
> > Notes:
> > v1: Please have an extra look at meson_gxbb_wdt.c
> >
> > drivers/watchdog/acquirewdt.c | 6 +---
> > drivers/watchdog/advantechwdt.c | 6 +---
> > drivers/watchdog/alim1535_wdt.c | 6 +---
> > drivers/watchdog/alim7101_wdt.c | 1 +
> > drivers/watchdog/ar7_wdt.c | 14 +--------
> > drivers/watchdog/asm9260_wdt.c | 2 +-
> > drivers/watchdog/aspeed_wdt.c | 5 +---
> > drivers/watchdog/at91rm9200_wdt.c | 5 +---
> > drivers/watchdog/at91sam9_wdt.c | 5 +---
> > drivers/watchdog/at91sam9_wdt.h | 5 +---
> > drivers/watchdog/ath79_wdt.c | 4 +--
> > drivers/watchdog/atlas7_wdt.c | 2 +-
> > drivers/watchdog/bcm2835_wdt.c | 5 +---
> > drivers/watchdog/bcm47xx_wdt.c | 5 +---
> > drivers/watchdog/bcm63xx_wdt.c | 5 +---
> > drivers/watchdog/bcm7038_wdt.c | 12 ++------
> > drivers/watchdog/bcm_kona_wdt.c | 9 +-----
> > drivers/watchdog/bfin_wdt.c | 2 +-
> > drivers/watchdog/booke_wdt.c | 5 +---
> > drivers/watchdog/cadence_wdt.c | 5 +---
> > drivers/watchdog/coh901327_wdt.c | 7 ++---
> > drivers/watchdog/cpu5wdt.c | 15 +---------
> > drivers/watchdog/cpwd.c | 1 +
> > drivers/watchdog/da9052_wdt.c | 6 +---
> > drivers/watchdog/da9055_wdt.c | 6 +---
> > drivers/watchdog/da9062_wdt.c | 10 +------
> > drivers/watchdog/da9063_wdt.c | 5 +---
> > drivers/watchdog/davinci_wdt.c | 7 ++---
> > drivers/watchdog/diag288_wdt.c | 1 +
> > drivers/watchdog/digicolor_wdt.c | 5 +---
> > drivers/watchdog/dw_wdt.c | 6 +---
> > drivers/watchdog/ebc-c384_wdt.c | 9 +-----
> > drivers/watchdog/ep93xx_wdt.c | 7 ++---
> > drivers/watchdog/eurotechwdt.c | 6 +---
> > drivers/watchdog/f71808e_wdt.c | 16 +---------
> > drivers/watchdog/ftwdt010_wdt.c | 6 ++--
> > drivers/watchdog/gef_wdt.c | 6 +---
> > drivers/watchdog/geodewdt.c | 5 +---
> > drivers/watchdog/gpio_wdt.c | 5 +---
> > drivers/watchdog/hpwdt.c | 7 ++---
> > drivers/watchdog/i6300esb.c | 6 +---
> > drivers/watchdog/iTCO_vendor_support.c | 9 +-----
> > drivers/watchdog/iTCO_wdt.c | 10 +------
> > drivers/watchdog/ib700wdt.c | 6 +---
> > drivers/watchdog/ibmasr.c | 3 +-
> > drivers/watchdog/ie6xx_wdt.c | 18 ++---------
> > drivers/watchdog/imgpdc_wdt.c | 5 +---
> > drivers/watchdog/imx2_wdt.c | 5 +---
> > drivers/watchdog/indydog.c | 6 +---
> > drivers/watchdog/intel-mid_wdt.c | 6 ++--
> > drivers/watchdog/intel_scu_watchdog.c | 18 ++---------
> > drivers/watchdog/intel_scu_watchdog.h | 16 +---------
> > drivers/watchdog/iop_wdt.c | 16 ++--------
> > drivers/watchdog/it8712f_wdt.c | 10 +------
> > drivers/watchdog/it87_wdt.c | 10 +------
> > drivers/watchdog/ixp4xx_wdt.c | 6 ++--
> > drivers/watchdog/jz4740_wdt.c | 10 +------
> > drivers/watchdog/kempld_wdt.c | 12 ++------
> > drivers/watchdog/ks8695_wdt.c | 6 ++--
> > drivers/watchdog/lantiq_wdt.c | 7 ++---
> > drivers/watchdog/loongson1_wdt.c | 5 +---
> > drivers/watchdog/lpc18xx_wdt.c | 5 +---
> > drivers/watchdog/m54xx_wdt.c | 6 ++--
> > drivers/watchdog/machzwd.c | 11 +------
> > drivers/watchdog/max63xx_wdt.c | 5 +---
> > drivers/watchdog/max77620_wdt.c | 5 +---
> > drivers/watchdog/mei_wdt.c | 12 ++------
> > drivers/watchdog/mena21_wdt.c | 4 +--
> > drivers/watchdog/menf21bmc_wdt.c | 8 ++---
> > drivers/watchdog/meson_gxbb_wdt.c | 55 +---------------------------------
> > drivers/watchdog/meson_wdt.c | 6 +---
> > drivers/watchdog/mixcomwd.c | 6 +---
> > drivers/watchdog/moxart_wdt.c | 7 ++---
> > drivers/watchdog/mpc8xxx_wdt.c | 6 +---
> > drivers/watchdog/mt7621_wdt.c | 5 +---
> > drivers/watchdog/mtk_wdt.c | 11 +------
> > drivers/watchdog/mtx-1_wdt.c | 11 +------
> > drivers/watchdog/mv64x60_wdt.c | 6 ++--
> > drivers/watchdog/ni903x_wdt.c | 11 +------
> > drivers/watchdog/nic7018_wdt.c | 11 +------
> > drivers/watchdog/nuc900_wdt.c | 7 ++---
> > drivers/watchdog/nv_tco.c | 6 +---
> > drivers/watchdog/nv_tco.h | 10 +------
> > drivers/watchdog/octeon-wdt-main.c | 11 +------
> > drivers/watchdog/octeon-wdt-nmi.S | 5 +---
> > drivers/watchdog/of_xilinx_wdt.c | 8 ++---
> > drivers/watchdog/omap_wdt.c | 1 +
> > drivers/watchdog/omap_wdt.h | 21 +------------
> > drivers/watchdog/orion_wdt.c | 5 +---
> > drivers/watchdog/pc87413_wdt.c | 10 +------
> > drivers/watchdog/pcwd.c | 1 +
> > drivers/watchdog/pcwd_pci.c | 10 +------
> > drivers/watchdog/pcwd_usb.c | 10 +------
> > drivers/watchdog/pic32-dmt.c | 5 +---
> > drivers/watchdog/pic32-wdt.c | 6 +---
> > drivers/watchdog/pika_wdt.c | 1 +
> > drivers/watchdog/pnx4008_wdt.c | 7 ++---
> > drivers/watchdog/pnx833x_wdt.c | 6 +---
> > drivers/watchdog/pretimeout_noop.c | 7 +----
> > drivers/watchdog/pretimeout_panic.c | 7 +----
> > drivers/watchdog/qcom-wdt.c | 14 ++-------
> > drivers/watchdog/renesas_wdt.c | 4 +--
> > drivers/watchdog/retu_wdt.c | 10 +------
> > drivers/watchdog/riowd.c | 1 +
> > drivers/watchdog/rn5t618_wdt.c | 8 +----
> > drivers/watchdog/rt2880_wdt.c | 5 +---
> > drivers/watchdog/rtd119x_wdt.c | 2 +-
> > drivers/watchdog/rza_wdt.c | 5 +---
> > drivers/watchdog/s3c2410_wdt.c | 11 +------
> > drivers/watchdog/sa1100_wdt.c | 11 +------
> > drivers/watchdog/sama5d4_wdt.c | 3 +-
> > drivers/watchdog/sb_wdog.c | 5 +---
> > drivers/watchdog/sbc60xxwdt.c | 10 +------
> > drivers/watchdog/sbc7240_wdt.c | 12 ++------
> > drivers/watchdog/sbc8360.c | 10 +------
> > drivers/watchdog/sbc_epx_c3.c | 6 +---
> > drivers/watchdog/sbc_fitpc2_wdt.c | 7 ++---
> > drivers/watchdog/sbsa_gwdt.c | 10 +------
> > drivers/watchdog/sc1200wdt.c | 10 +------
> > drivers/watchdog/sc520_wdt.c | 10 +------
> > drivers/watchdog/sch311x_wdt.c | 10 +------
> > drivers/watchdog/scx200_wdt.c | 10 ++-----
> > drivers/watchdog/shwdt.c | 6 +---
> > drivers/watchdog/sirfsoc_wdt.c | 5 ++--
> > drivers/watchdog/smsc37b787_wdt.c | 10 +------
> > drivers/watchdog/softdog.c | 10 +------
> > drivers/watchdog/sp5100_tco.c | 6 +---
> > drivers/watchdog/sp805_wdt.c | 5 +---
> > drivers/watchdog/sprd_wdt.c | 10 +------
> > drivers/watchdog/st_lpc_wdt.c | 6 +---
> > drivers/watchdog/stmp3xxx_rtc_wdt.c | 5 +---
> > drivers/watchdog/sun4v_wdt.c | 6 +---
> > drivers/watchdog/sunxi_wdt.c | 6 +---
> > drivers/watchdog/tangox_wdt.c | 6 +---
> > drivers/watchdog/tegra_wdt.c | 10 +------
> > drivers/watchdog/ts4800_wdt.c | 5 +---
> > drivers/watchdog/ts72xx_wdt.c | 7 ++---
> > drivers/watchdog/twl4030_wdt.c | 15 +---------
> > drivers/watchdog/txx9wdt.c | 9 ++----
> > drivers/watchdog/uniphier_wdt.c | 10 +------
> > drivers/watchdog/ux500_wdt.c | 5 ++--
> > drivers/watchdog/via_wdt.c | 4 +--
> > drivers/watchdog/w83627hf_wdt.c | 10 +------
> > drivers/watchdog/w83877f_wdt.c | 10 +------
> > drivers/watchdog/w83977f_wdt.c | 9 +-----
> > drivers/watchdog/wafer5823wdt.c | 11 +------
> > drivers/watchdog/watchdog_core.c | 10 +------
> > drivers/watchdog/watchdog_core.h | 10 +------
> > drivers/watchdog/watchdog_dev.c | 10 +------
> > drivers/watchdog/watchdog_pretimeout.c | 6 +---
> > drivers/watchdog/wd501p.h | 1 +
> > drivers/watchdog/wdat_wdt.c | 5 +---
> > drivers/watchdog/wdrtas.c | 15 +---------
> > drivers/watchdog/wdt.c | 11 +------
> > drivers/watchdog/wdt285.c | 7 +----
> > drivers/watchdog/wdt977.c | 8 +----
> > drivers/watchdog/wdt_pci.c | 11 +------
> > drivers/watchdog/wm831x_wdt.c | 5 +---
> > drivers/watchdog/wm8350_wdt.c | 5 +---
> > drivers/watchdog/xen_wdt.c | 6 +---
> > drivers/watchdog/ziirave_wdt.c | 11 +------
> > drivers/watchdog/zx2967_wdt.c | 3 +-
> > 162 files changed, 195 insertions(+), 1059 deletions(-)
> >
>
> [..]
>
> > diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c
> > index 69a5a57f1446..500463c3e040 100644
> > --- a/drivers/watchdog/meson_gxbb_wdt.c
> > +++ b/drivers/watchdog/meson_gxbb_wdt.c
> > @@ -1,57 +1,4 @@
> > -/*
> > - * This file is provided under a dual BSD/GPLv2 license. When using or
> > - * redistributing this file, you may do so under either license.
> > - *
> > - * GPL LICENSE SUMMARY
> > - *
> > - * Copyright (c) 2016 BayLibre, SAS.
> > - * Author: Neil Armstrong <narmstrong@baylibre.com>
>
> Please keep the copyright !
Sorry Neil!
I will fix that for v2.
I saw that the copyright text has magically disappered for
coh901327_wdt.c as well.
What do you think about the BSD license? Is BSD-2-Clause right?
>
> > - *
> > - * This program is free software; you can redistribute it and/or modify
> > - * it under the terms of version 2 of the GNU General Public License 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.
> > - *
> > - * You should have received a copy of the GNU General Public License
> > - * along with this program; if not, see <http://www.gnu.org/licenses/>.
> > - * The full GNU General Public License is included in this distribution
> > - * in the file called COPYING.
> > - *
> > - * BSD LICENSE
> > - *
> > - * Copyright (c) 2016 BayLibre, SAS.
> > - * Author: Neil Armstrong <narmstrong@baylibre.com>
> > - *
> > - * Redistribution and use in source and binary forms, with or without
> > - * modification, are permitted provided that the following conditions
> > - * are met:
> > - *
> > - * * Redistributions of source code must retain the above copyright
> > - * notice, this list of conditions and the following disclaimer.
> > - * * Redistributions in binary form must reproduce the above copyright
> > - * notice, this list of conditions and the following disclaimer in
> > - * the documentation and/or other materials provided with the
> > - * distribution.
> > - * * Neither the name of Intel Corporation nor the names of its
> > - * contributors may be used to endorse or promote products derived
> > - * from this software without specific prior written permission.
> > - *
> > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> > - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> > - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> > - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> > - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> > - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> > - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> > - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> > - */
> > +// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
> > #include <linux/clk.h>
> > #include <linux/err.h>
> > #include <linux/io.h>
> [..]
>
> Thanks,
> Neil
Best regards
Marcus Folkesson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Marcus Folkesson <marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org,
Baruch Siach <baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org>,
Mans Rullgard <mans-2StjZFpD7GcAvxtiuMwx3w@public.gmane.org>,
Maxime Ripard
<maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>,
Benjamin Herrenschmidt
<benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>,
Linus Walleij
<linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
adi-buildroot-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
Patrice Chotard <patrice.chotard-qxv4g6HH51o@public.gmane.org>,
Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org>,
Thierry Reding
<thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Alexandre Belloni
<alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>,
Michael Ellerman <mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org>,
Baoyou Xie <baoyou.xie-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Stefan Wahren <stefan.wahren-eS4NqCHxEME@public.gmane.org>,
Florian Fainelli
<f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Kevin Hilman <khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>,
Michal Simek
<michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>,
Krzysztof Kozlowski
<krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Jonathan Hunter
<jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>,
Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>,
Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w@public.gmane.org,
Joel Stanley <joel@jms.i>
Subject: Re: [PATCH] watchdog: add SPDX identifiers for watchdog subsystem
Date: Tue, 20 Feb 2018 10:59:26 +0100 [thread overview]
Message-ID: <20180220095811.GA24311@gmail.com> (raw)
In-Reply-To: <d734dd84-ad3b-141b-779d-13d340217a18-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
[-- Attachment #1.1: Type: text/plain, Size: 13352 bytes --]
On Tue, Feb 20, 2018 at 10:47:03AM +0100, Neil Armstrong wrote:
> Hi Marcus,
>
> On 20/02/2018 10:31, 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 <marcus.folkesson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > ---
> >
> > Notes:
> > v1: Please have an extra look at meson_gxbb_wdt.c
> >
> > drivers/watchdog/acquirewdt.c | 6 +---
> > drivers/watchdog/advantechwdt.c | 6 +---
> > drivers/watchdog/alim1535_wdt.c | 6 +---
> > drivers/watchdog/alim7101_wdt.c | 1 +
> > drivers/watchdog/ar7_wdt.c | 14 +--------
> > drivers/watchdog/asm9260_wdt.c | 2 +-
> > drivers/watchdog/aspeed_wdt.c | 5 +---
> > drivers/watchdog/at91rm9200_wdt.c | 5 +---
> > drivers/watchdog/at91sam9_wdt.c | 5 +---
> > drivers/watchdog/at91sam9_wdt.h | 5 +---
> > drivers/watchdog/ath79_wdt.c | 4 +--
> > drivers/watchdog/atlas7_wdt.c | 2 +-
> > drivers/watchdog/bcm2835_wdt.c | 5 +---
> > drivers/watchdog/bcm47xx_wdt.c | 5 +---
> > drivers/watchdog/bcm63xx_wdt.c | 5 +---
> > drivers/watchdog/bcm7038_wdt.c | 12 ++------
> > drivers/watchdog/bcm_kona_wdt.c | 9 +-----
> > drivers/watchdog/bfin_wdt.c | 2 +-
> > drivers/watchdog/booke_wdt.c | 5 +---
> > drivers/watchdog/cadence_wdt.c | 5 +---
> > drivers/watchdog/coh901327_wdt.c | 7 ++---
> > drivers/watchdog/cpu5wdt.c | 15 +---------
> > drivers/watchdog/cpwd.c | 1 +
> > drivers/watchdog/da9052_wdt.c | 6 +---
> > drivers/watchdog/da9055_wdt.c | 6 +---
> > drivers/watchdog/da9062_wdt.c | 10 +------
> > drivers/watchdog/da9063_wdt.c | 5 +---
> > drivers/watchdog/davinci_wdt.c | 7 ++---
> > drivers/watchdog/diag288_wdt.c | 1 +
> > drivers/watchdog/digicolor_wdt.c | 5 +---
> > drivers/watchdog/dw_wdt.c | 6 +---
> > drivers/watchdog/ebc-c384_wdt.c | 9 +-----
> > drivers/watchdog/ep93xx_wdt.c | 7 ++---
> > drivers/watchdog/eurotechwdt.c | 6 +---
> > drivers/watchdog/f71808e_wdt.c | 16 +---------
> > drivers/watchdog/ftwdt010_wdt.c | 6 ++--
> > drivers/watchdog/gef_wdt.c | 6 +---
> > drivers/watchdog/geodewdt.c | 5 +---
> > drivers/watchdog/gpio_wdt.c | 5 +---
> > drivers/watchdog/hpwdt.c | 7 ++---
> > drivers/watchdog/i6300esb.c | 6 +---
> > drivers/watchdog/iTCO_vendor_support.c | 9 +-----
> > drivers/watchdog/iTCO_wdt.c | 10 +------
> > drivers/watchdog/ib700wdt.c | 6 +---
> > drivers/watchdog/ibmasr.c | 3 +-
> > drivers/watchdog/ie6xx_wdt.c | 18 ++---------
> > drivers/watchdog/imgpdc_wdt.c | 5 +---
> > drivers/watchdog/imx2_wdt.c | 5 +---
> > drivers/watchdog/indydog.c | 6 +---
> > drivers/watchdog/intel-mid_wdt.c | 6 ++--
> > drivers/watchdog/intel_scu_watchdog.c | 18 ++---------
> > drivers/watchdog/intel_scu_watchdog.h | 16 +---------
> > drivers/watchdog/iop_wdt.c | 16 ++--------
> > drivers/watchdog/it8712f_wdt.c | 10 +------
> > drivers/watchdog/it87_wdt.c | 10 +------
> > drivers/watchdog/ixp4xx_wdt.c | 6 ++--
> > drivers/watchdog/jz4740_wdt.c | 10 +------
> > drivers/watchdog/kempld_wdt.c | 12 ++------
> > drivers/watchdog/ks8695_wdt.c | 6 ++--
> > drivers/watchdog/lantiq_wdt.c | 7 ++---
> > drivers/watchdog/loongson1_wdt.c | 5 +---
> > drivers/watchdog/lpc18xx_wdt.c | 5 +---
> > drivers/watchdog/m54xx_wdt.c | 6 ++--
> > drivers/watchdog/machzwd.c | 11 +------
> > drivers/watchdog/max63xx_wdt.c | 5 +---
> > drivers/watchdog/max77620_wdt.c | 5 +---
> > drivers/watchdog/mei_wdt.c | 12 ++------
> > drivers/watchdog/mena21_wdt.c | 4 +--
> > drivers/watchdog/menf21bmc_wdt.c | 8 ++---
> > drivers/watchdog/meson_gxbb_wdt.c | 55 +---------------------------------
> > drivers/watchdog/meson_wdt.c | 6 +---
> > drivers/watchdog/mixcomwd.c | 6 +---
> > drivers/watchdog/moxart_wdt.c | 7 ++---
> > drivers/watchdog/mpc8xxx_wdt.c | 6 +---
> > drivers/watchdog/mt7621_wdt.c | 5 +---
> > drivers/watchdog/mtk_wdt.c | 11 +------
> > drivers/watchdog/mtx-1_wdt.c | 11 +------
> > drivers/watchdog/mv64x60_wdt.c | 6 ++--
> > drivers/watchdog/ni903x_wdt.c | 11 +------
> > drivers/watchdog/nic7018_wdt.c | 11 +------
> > drivers/watchdog/nuc900_wdt.c | 7 ++---
> > drivers/watchdog/nv_tco.c | 6 +---
> > drivers/watchdog/nv_tco.h | 10 +------
> > drivers/watchdog/octeon-wdt-main.c | 11 +------
> > drivers/watchdog/octeon-wdt-nmi.S | 5 +---
> > drivers/watchdog/of_xilinx_wdt.c | 8 ++---
> > drivers/watchdog/omap_wdt.c | 1 +
> > drivers/watchdog/omap_wdt.h | 21 +------------
> > drivers/watchdog/orion_wdt.c | 5 +---
> > drivers/watchdog/pc87413_wdt.c | 10 +------
> > drivers/watchdog/pcwd.c | 1 +
> > drivers/watchdog/pcwd_pci.c | 10 +------
> > drivers/watchdog/pcwd_usb.c | 10 +------
> > drivers/watchdog/pic32-dmt.c | 5 +---
> > drivers/watchdog/pic32-wdt.c | 6 +---
> > drivers/watchdog/pika_wdt.c | 1 +
> > drivers/watchdog/pnx4008_wdt.c | 7 ++---
> > drivers/watchdog/pnx833x_wdt.c | 6 +---
> > drivers/watchdog/pretimeout_noop.c | 7 +----
> > drivers/watchdog/pretimeout_panic.c | 7 +----
> > drivers/watchdog/qcom-wdt.c | 14 ++-------
> > drivers/watchdog/renesas_wdt.c | 4 +--
> > drivers/watchdog/retu_wdt.c | 10 +------
> > drivers/watchdog/riowd.c | 1 +
> > drivers/watchdog/rn5t618_wdt.c | 8 +----
> > drivers/watchdog/rt2880_wdt.c | 5 +---
> > drivers/watchdog/rtd119x_wdt.c | 2 +-
> > drivers/watchdog/rza_wdt.c | 5 +---
> > drivers/watchdog/s3c2410_wdt.c | 11 +------
> > drivers/watchdog/sa1100_wdt.c | 11 +------
> > drivers/watchdog/sama5d4_wdt.c | 3 +-
> > drivers/watchdog/sb_wdog.c | 5 +---
> > drivers/watchdog/sbc60xxwdt.c | 10 +------
> > drivers/watchdog/sbc7240_wdt.c | 12 ++------
> > drivers/watchdog/sbc8360.c | 10 +------
> > drivers/watchdog/sbc_epx_c3.c | 6 +---
> > drivers/watchdog/sbc_fitpc2_wdt.c | 7 ++---
> > drivers/watchdog/sbsa_gwdt.c | 10 +------
> > drivers/watchdog/sc1200wdt.c | 10 +------
> > drivers/watchdog/sc520_wdt.c | 10 +------
> > drivers/watchdog/sch311x_wdt.c | 10 +------
> > drivers/watchdog/scx200_wdt.c | 10 ++-----
> > drivers/watchdog/shwdt.c | 6 +---
> > drivers/watchdog/sirfsoc_wdt.c | 5 ++--
> > drivers/watchdog/smsc37b787_wdt.c | 10 +------
> > drivers/watchdog/softdog.c | 10 +------
> > drivers/watchdog/sp5100_tco.c | 6 +---
> > drivers/watchdog/sp805_wdt.c | 5 +---
> > drivers/watchdog/sprd_wdt.c | 10 +------
> > drivers/watchdog/st_lpc_wdt.c | 6 +---
> > drivers/watchdog/stmp3xxx_rtc_wdt.c | 5 +---
> > drivers/watchdog/sun4v_wdt.c | 6 +---
> > drivers/watchdog/sunxi_wdt.c | 6 +---
> > drivers/watchdog/tangox_wdt.c | 6 +---
> > drivers/watchdog/tegra_wdt.c | 10 +------
> > drivers/watchdog/ts4800_wdt.c | 5 +---
> > drivers/watchdog/ts72xx_wdt.c | 7 ++---
> > drivers/watchdog/twl4030_wdt.c | 15 +---------
> > drivers/watchdog/txx9wdt.c | 9 ++----
> > drivers/watchdog/uniphier_wdt.c | 10 +------
> > drivers/watchdog/ux500_wdt.c | 5 ++--
> > drivers/watchdog/via_wdt.c | 4 +--
> > drivers/watchdog/w83627hf_wdt.c | 10 +------
> > drivers/watchdog/w83877f_wdt.c | 10 +------
> > drivers/watchdog/w83977f_wdt.c | 9 +-----
> > drivers/watchdog/wafer5823wdt.c | 11 +------
> > drivers/watchdog/watchdog_core.c | 10 +------
> > drivers/watchdog/watchdog_core.h | 10 +------
> > drivers/watchdog/watchdog_dev.c | 10 +------
> > drivers/watchdog/watchdog_pretimeout.c | 6 +---
> > drivers/watchdog/wd501p.h | 1 +
> > drivers/watchdog/wdat_wdt.c | 5 +---
> > drivers/watchdog/wdrtas.c | 15 +---------
> > drivers/watchdog/wdt.c | 11 +------
> > drivers/watchdog/wdt285.c | 7 +----
> > drivers/watchdog/wdt977.c | 8 +----
> > drivers/watchdog/wdt_pci.c | 11 +------
> > drivers/watchdog/wm831x_wdt.c | 5 +---
> > drivers/watchdog/wm8350_wdt.c | 5 +---
> > drivers/watchdog/xen_wdt.c | 6 +---
> > drivers/watchdog/ziirave_wdt.c | 11 +------
> > drivers/watchdog/zx2967_wdt.c | 3 +-
> > 162 files changed, 195 insertions(+), 1059 deletions(-)
> >
>
> [..]
>
> > diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c
> > index 69a5a57f1446..500463c3e040 100644
> > --- a/drivers/watchdog/meson_gxbb_wdt.c
> > +++ b/drivers/watchdog/meson_gxbb_wdt.c
> > @@ -1,57 +1,4 @@
> > -/*
> > - * This file is provided under a dual BSD/GPLv2 license. When using or
> > - * redistributing this file, you may do so under either license.
> > - *
> > - * GPL LICENSE SUMMARY
> > - *
> > - * Copyright (c) 2016 BayLibre, SAS.
> > - * Author: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
>
> Please keep the copyright !
Sorry Neil!
I will fix that for v2.
I saw that the copyright text has magically disappered for
coh901327_wdt.c as well.
What do you think about the BSD license? Is BSD-2-Clause right?
>
> > - *
> > - * This program is free software; you can redistribute it and/or modify
> > - * it under the terms of version 2 of the GNU General Public License 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.
> > - *
> > - * You should have received a copy of the GNU General Public License
> > - * along with this program; if not, see <http://www.gnu.org/licenses/>.
> > - * The full GNU General Public License is included in this distribution
> > - * in the file called COPYING.
> > - *
> > - * BSD LICENSE
> > - *
> > - * Copyright (c) 2016 BayLibre, SAS.
> > - * Author: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
> > - *
> > - * Redistribution and use in source and binary forms, with or without
> > - * modification, are permitted provided that the following conditions
> > - * are met:
> > - *
> > - * * Redistributions of source code must retain the above copyright
> > - * notice, this list of conditions and the following disclaimer.
> > - * * Redistributions in binary form must reproduce the above copyright
> > - * notice, this list of conditions and the following disclaimer in
> > - * the documentation and/or other materials provided with the
> > - * distribution.
> > - * * Neither the name of Intel Corporation nor the names of its
> > - * contributors may be used to endorse or promote products derived
> > - * from this software without specific prior written permission.
> > - *
> > - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> > - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> > - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> > - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> > - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> > - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> > - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> > - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> > - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> > - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> > - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> > - */
> > +// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
> > #include <linux/clk.h>
> > #include <linux/err.h>
> > #include <linux/io.h>
> [..]
>
> Thanks,
> Neil
Best regards
Marcus Folkesson
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 200 bytes --]
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2018-02-20 9:59 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-20 9:31 [PATCH] watchdog: add SPDX identifiers for watchdog subsystem Marcus Folkesson
2018-02-20 9:31 ` Marcus Folkesson
2018-02-20 9:31 ` Marcus Folkesson
2018-02-20 9:47 ` Neil Armstrong
2018-02-20 9:47 ` Neil Armstrong
2018-02-20 9:47 ` Neil Armstrong
2018-02-20 9:59 ` Marcus Folkesson [this message]
2018-02-20 9:59 ` Marcus Folkesson
2018-02-20 9:59 ` Marcus Folkesson
2018-02-20 10:30 ` Neil Armstrong
2018-02-20 10:30 ` Neil Armstrong
2018-02-20 10:30 ` Neil Armstrong
2018-02-20 10:14 ` Michal Simek
2018-02-20 10:14 ` Michal Simek
2018-02-20 10:14 ` Michal Simek
2018-02-20 10:14 ` Michal Simek
2018-02-20 10:15 ` Nicolas Ferre
2018-02-20 10:15 ` Nicolas Ferre
2018-02-20 10:15 ` Nicolas Ferre
2018-02-20 10:15 ` Nicolas Ferre
2018-02-20 10:20 ` Charles Keepax
2018-02-20 10:20 ` Charles Keepax
2018-02-20 10:20 ` Charles Keepax
2018-02-20 10:20 ` Charles Keepax
2018-02-20 10:29 ` Adam Thomson
2018-02-20 10:29 ` Adam Thomson
2018-02-20 10:29 ` Adam Thomson
2018-02-20 10:29 ` Adam Thomson
2018-02-20 11:59 ` Eric Anholt
2018-02-20 11:59 ` Eric Anholt
2018-02-21 12:34 ` Patrice CHOTARD
2018-02-21 12:34 ` Patrice CHOTARD
2018-02-21 12:34 ` Patrice CHOTARD
2018-02-21 12:34 ` Patrice CHOTARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180220095811.GA24311@gmail.com \
--to=marcus.folkesson@gmail.com \
--cc=linus-amlogic@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.