| Message ID | 20230512100620.36807-9-bagasdotme@gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) | expand |
On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote: > diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c > index 504be461f992a9..822bf8905bf3ce 100644 > --- a/drivers/watchdog/sb_wdog.c > +++ b/drivers/watchdog/sb_wdog.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-1.0+ > /* > * Watchdog driver for SiByte SB1 SoCs > * > @@ -38,10 +39,6 @@ > * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, > * 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 > - * version 1 or 2 as published by the Free Software Foundation. Shouldn't this be // SPDX-License-Identifier: GPL-1.0 OR GPL-2.0 (or in current SPDX notation GPL-1.0-only OR GPL-2.0-only) ?
On Fri, May 12, 2023 at 05:06:19PM +0700, Bagas Sanjaya wrote: > Many watchdog drivers's source files has already SPDX license > identifier, while some remaining doesn't. > > Convert notices on remaining files to SPDX identifier. While at it, > also move SPDX identifier for drivers/watchdog/rtd119x_wdt.c to the > top of file (as in other files). > > Cc: Ray Lehtiniemi <rayl@mail.com> > Cc: Alessandro Zummo <a.zummo@towertech.it> > Cc: Andrey Panin <pazke@donpac.ru> > Cc: Oleg Drokin <green@crimea.edu> > Cc: Marc Zyngier <maz@kernel.org> > Cc: Jonas Jensen <jonas.jensen@gmail.com> > Cc: Sylver Bruneau <sylver.bruneau@googlemail.com> > Cc: Andrew Sharp <andy.sharp@lsi.com> > Cc: Denis Turischev <denis@compulab.co.il> > Cc: Mika Westerberg <mika.westerberg@linux.intel.com> > Cc: Alan Cox <alan@linux.intel.com> > Reviewed-by: Simon Horman <simon.horman@corigine.com> > Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> > --- > drivers/watchdog/ep93xx_wdt.c | 5 +---- > drivers/watchdog/ibmasr.c | 3 +-- > drivers/watchdog/m54xx_wdt.c | 4 +--- > drivers/watchdog/max63xx_wdt.c | 5 +---- > drivers/watchdog/moxart_wdt.c | 4 +--- > drivers/watchdog/octeon-wdt-nmi.S | 5 +---- > drivers/watchdog/orion_wdt.c | 4 +--- > drivers/watchdog/rtd119x_wdt.c | 2 +- > drivers/watchdog/sb_wdog.c | 5 +---- > drivers/watchdog/sbc_fitpc2_wdt.c | 4 +--- > drivers/watchdog/ts4800_wdt.c | 4 +--- > drivers/watchdog/ts72xx_wdt.c | 4 +--- > 12 files changed, 12 insertions(+), 37 deletions(-) > [ ... ] > diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c > index 504be461f992a9..822bf8905bf3ce 100644 > --- a/drivers/watchdog/sb_wdog.c > +++ b/drivers/watchdog/sb_wdog.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-1.0+ This would include GPL 3, but the text below explicitly excludes that. No idea how to handle that. Guenter > /* > * Watchdog driver for SiByte SB1 SoCs > * > @@ -38,10 +39,6 @@ > * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, > * 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 > - * version 1 or 2 as published by the Free Software Foundation. > - * > */
On 5/12/23 17:06, Bagas Sanjaya wrote: > diff --git a/drivers/watchdog/octeon-wdt-nmi.S b/drivers/watchdog/octeon-wdt-nmi.S > index 97f6eb7b5a8e04..57bb0845de477d 100644 > --- a/drivers/watchdog/octeon-wdt-nmi.S > +++ b/drivers/watchdog/octeon-wdt-nmi.S > @@ -1,8 +1,5 @@ > +/* SPDX-License-Identifier: GPL-1.0+ */ > /* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * Oops, still incorrect tag. Will fix in v3 (should be out on next Monday).
Hi, Am 12.05.23 um 12:06 schrieb Bagas Sanjaya: > Many watchdog drivers's source files has already SPDX license > identifier, while some remaining doesn't. > > Convert notices on remaining files to SPDX identifier. While at it, > also move SPDX identifier for drivers/watchdog/rtd119x_wdt.c to the > top of file (as in other files). > > Cc: Ray Lehtiniemi <rayl@mail.com> > Cc: Alessandro Zummo <a.zummo@towertech.it> > Cc: Andrey Panin <pazke@donpac.ru> > Cc: Oleg Drokin <green@crimea.edu> > Cc: Marc Zyngier <maz@kernel.org> > Cc: Jonas Jensen <jonas.jensen@gmail.com> > Cc: Sylver Bruneau <sylver.bruneau@googlemail.com> > Cc: Andrew Sharp <andy.sharp@lsi.com> > Cc: Denis Turischev <denis@compulab.co.il> > Cc: Mika Westerberg <mika.westerberg@linux.intel.com> > Cc: Alan Cox <alan@linux.intel.com> > Reviewed-by: Simon Horman <simon.horman@corigine.com> > Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> > --- [...] > diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c > index 95c8d7abce42e6..984905695dde51 100644 > --- a/drivers/watchdog/rtd119x_wdt.c > +++ b/drivers/watchdog/rtd119x_wdt.c > @@ -1,9 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Realtek RTD129x watchdog > * > * Copyright (c) 2017 Andreas Färber > * > - * SPDX-License-Identifier: GPL-2.0+ > */ > > #include <linux/bitops.h> Acked-by: Andreas Färber <afaerber@suse.de> # for RTD119x Thanks, Andreas
On 5/12/23 19:46, Richard Fontana wrote: > On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote: > > >> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c >> index 504be461f992a9..822bf8905bf3ce 100644 >> --- a/drivers/watchdog/sb_wdog.c >> +++ b/drivers/watchdog/sb_wdog.c >> @@ -1,3 +1,4 @@ >> +// SPDX-License-Identifier: GPL-1.0+ >> /* >> * Watchdog driver for SiByte SB1 SoCs >> * >> @@ -38,10 +39,6 @@ >> * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, >> * 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 >> - * version 1 or 2 as published by the Free Software Foundation. > > Shouldn't this be > // SPDX-License-Identifier: GPL-1.0 OR GPL-2.0 > (or in current SPDX notation GPL-1.0-only OR GPL-2.0-only) ? > Nope, as it will fail spdxcheck.py. Also, SPDX specification [1] doesn't have negation operator (NOT), thus the licensing requirement on the above notice can't be expressed reliably in SPDX here. [1]: https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/
On Sat, May 13, 2023 at 6:53 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote: > > On 5/12/23 19:46, Richard Fontana wrote: > > On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote: > > > > > >> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c > >> index 504be461f992a9..822bf8905bf3ce 100644 > >> --- a/drivers/watchdog/sb_wdog.c > >> +++ b/drivers/watchdog/sb_wdog.c > >> @@ -1,3 +1,4 @@ > >> +// SPDX-License-Identifier: GPL-1.0+ > >> /* > >> * Watchdog driver for SiByte SB1 SoCs > >> * > >> @@ -38,10 +39,6 @@ > >> * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, > >> * 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 > >> - * version 1 or 2 as published by the Free Software Foundation. > > > > Shouldn't this be > > // SPDX-License-Identifier: GPL-1.0 OR GPL-2.0 > > (or in current SPDX notation GPL-1.0-only OR GPL-2.0-only) ? > > > > Nope, as it will fail spdxcheck.py. Also, SPDX specification [1] > doesn't have negation operator (NOT), thus the licensing requirement > on the above notice can't be expressed reliably in SPDX here. > > [1]: https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/ The GPL identifiers in recent versions of SPDX include an `-only` and an `-or-later` variant. So I don't see why you can't represent it as `GPL-1.0-only OR GPL-2.0-only`. From what I understand the kernel requires/prefers use of the earlier approach to GPL identifiers (which was better in my opinion) under which `GPL-1.0 OR GPL-2.0` would at least be semantically similar. I don't see why you need a negation operator in this case. You have other patches where you used the `-only` identifiers. Richard
On Sat, May 13, 2023 at 09:43:39AM -0400, Richard Fontana wrote: > On Sat, May 13, 2023 at 6:53 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote: > > > > On 5/12/23 19:46, Richard Fontana wrote: > > > On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote: > > > > > > > > >> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c > > >> index 504be461f992a9..822bf8905bf3ce 100644 > > >> --- a/drivers/watchdog/sb_wdog.c > > >> +++ b/drivers/watchdog/sb_wdog.c > > >> @@ -1,3 +1,4 @@ > > >> +// SPDX-License-Identifier: GPL-1.0+ > > >> /* > > >> * Watchdog driver for SiByte SB1 SoCs > > >> * > > >> @@ -38,10 +39,6 @@ > > >> * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, > > >> * 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 > > >> - * version 1 or 2 as published by the Free Software Foundation. > > > > > > Shouldn't this be > > > // SPDX-License-Identifier: GPL-1.0 OR GPL-2.0 > > > (or in current SPDX notation GPL-1.0-only OR GPL-2.0-only) ? > > > > > > > Nope, as it will fail spdxcheck.py. Also, SPDX specification [1] > > doesn't have negation operator (NOT), thus the licensing requirement > > on the above notice can't be expressed reliably in SPDX here. > > > > [1]: https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/ > > The GPL identifiers in recent versions of SPDX include an `-only` and > an `-or-later` variant. But Linux does not use the newer versions of SPDX given that we started the conversion before the "-only" variant came out. Let's stick with the original one please before worrying about converting to a newer version of SPDX and mixing things up. thanks, greg k-h
On Sun, May 14, 2023 at 12:07:28AM +0900, Greg Kroah-Hartman wrote: > On Sat, May 13, 2023 at 09:43:39AM -0400, Richard Fontana wrote: > > On Sat, May 13, 2023 at 6:53 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote: > > > > > > On 5/12/23 19:46, Richard Fontana wrote: > > > > On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote: > > > > > > > > > > > >> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c > > > >> index 504be461f992a9..822bf8905bf3ce 100644 > > > >> --- a/drivers/watchdog/sb_wdog.c > > > >> +++ b/drivers/watchdog/sb_wdog.c > > > >> @@ -1,3 +1,4 @@ > > > >> +// SPDX-License-Identifier: GPL-1.0+ > > > >> /* > > > >> * Watchdog driver for SiByte SB1 SoCs > > > >> * > > > >> @@ -38,10 +39,6 @@ > > > >> * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, > > > >> * 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 > > > >> - * version 1 or 2 as published by the Free Software Foundation. > > > > > > > > Shouldn't this be > > > > // SPDX-License-Identifier: GPL-1.0 OR GPL-2.0 > > > > (or in current SPDX notation GPL-1.0-only OR GPL-2.0-only) ? > > > > > > > > > > Nope, as it will fail spdxcheck.py. Also, SPDX specification [1] > > > doesn't have negation operator (NOT), thus the licensing requirement > > > on the above notice can't be expressed reliably in SPDX here. > > > > > > [1]: https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/ > > > > The GPL identifiers in recent versions of SPDX include an `-only` and > > an `-or-later` variant. > > But Linux does not use the newer versions of SPDX given that we started > the conversion before the "-only" variant came out. Let's stick with > the original one please before worrying about converting to a newer > version of SPDX and mixing things up. > Either case I'd prefer to have no conversion if there is no means to express the original license (ie GPL-1.0 or GPL-2.0 and nothing else) in acceptable SPDX form. Thanks, Guenter
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 38e26f160b9a57..59dfd7f6bf0ba1 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Watchdog driver for Cirrus Logic EP93xx family of devices. * @@ -11,10 +12,6 @@ * Copyright (c) 2012 H Hartley Sweeten <hsweeten@visionengravers.com> * Convert to a platform device and use the watchdog framework API * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - * * This watchdog fires after 250msec, which is a too short interval * for us to rely on the user space daemon alone. So we ping the * wdt each ~200msec and eventually stop doing it if the user space diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c index 4a22fe15208630..6955c693b5fd00 100644 --- a/drivers/watchdog/ibmasr.c +++ b/drivers/watchdog/ibmasr.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * IBM Automatic Server Restart driver. * @@ -6,8 +7,6 @@ * Based on driver written by Pete Reynolds. * Copyright (c) IBM Corporation, 1998-2004. * - * This software may be used and distributed according to the terms - * of the GNU Public License, incorporated herein by reference. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c index f388a769dbd33d..062ea3e6497e52 100644 --- a/drivers/watchdog/m54xx_wdt.c +++ b/drivers/watchdog/m54xx_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/watchdog/m54xx_wdt.c * @@ -11,9 +12,6 @@ * Copyright 2004 (c) MontaVista, Software, Inc. * Based on sa1100 driver, Copyright (C) 2000 Oleg Drokin <green@crimea.edu> * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c index 9e1541cfae0d89..21935f9620e463 100644 --- a/drivers/watchdog/max63xx_wdt.c +++ b/drivers/watchdog/max63xx_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/char/watchdog/max63xx_wdt.c * @@ -5,10 +6,6 @@ * * Copyright (C) 2009 Marc Zyngier <maz@misterjones.org> * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - * * This driver assumes the watchdog pins are memory mapped (as it is * the case for the Arcom Zeus). Should it be connected over GPIOs or * another interface, some abstraction will have to be introduced. diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c index 6340a1f5f471b2..b7b1da3c932ded 100644 --- a/drivers/watchdog/moxart_wdt.c +++ b/drivers/watchdog/moxart_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * MOXA ART SoCs watchdog driver. * @@ -5,9 +6,6 @@ * * Jonas Jensen <jonas.jensen@gmail.com> * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #include <linux/clk.h> diff --git a/drivers/watchdog/octeon-wdt-nmi.S b/drivers/watchdog/octeon-wdt-nmi.S index 97f6eb7b5a8e04..57bb0845de477d 100644 --- a/drivers/watchdog/octeon-wdt-nmi.S +++ b/drivers/watchdog/octeon-wdt-nmi.S @@ -1,8 +1,5 @@ +/* SPDX-License-Identifier: GPL-1.0+ */ /* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * * Copyright (C) 2007-2017 Cavium, Inc. */ #include <asm/asm.h> diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 5ec2dd8fd5fa3d..1fe583e8a95b2e 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/watchdog/orion_wdt.c * @@ -5,9 +6,6 @@ * * Author: Sylver Bruneau <sylver.bruneau@googlemail.com> * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/watchdog/rtd119x_wdt.c b/drivers/watchdog/rtd119x_wdt.c index 95c8d7abce42e6..984905695dde51 100644 --- a/drivers/watchdog/rtd119x_wdt.c +++ b/drivers/watchdog/rtd119x_wdt.c @@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Realtek RTD129x watchdog * * Copyright (c) 2017 Andreas Färber * - * SPDX-License-Identifier: GPL-2.0+ */ #include <linux/bitops.h> diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c index 504be461f992a9..822bf8905bf3ce 100644 --- a/drivers/watchdog/sb_wdog.c +++ b/drivers/watchdog/sb_wdog.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * Watchdog driver for SiByte SB1 SoCs * @@ -38,10 +39,6 @@ * (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, * 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 - * version 1 or 2 as published by the Free Software Foundation. - * */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c index 13db71e165836e..b8eb8d5ca1af0c 100644 --- a/drivers/watchdog/sbc_fitpc2_wdt.c +++ b/drivers/watchdog/sbc_fitpc2_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Watchdog driver for SBC-FITPC2 board * @@ -5,9 +6,6 @@ * * Adapted from the IXP2000 watchdog driver by Deepak Saxena. * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #define pr_fmt(fmt) KBUILD_MODNAME " WATCHDOG: " fmt diff --git a/drivers/watchdog/ts4800_wdt.c b/drivers/watchdog/ts4800_wdt.c index 0ea554c7cda579..0099403f49922f 100644 --- a/drivers/watchdog/ts4800_wdt.c +++ b/drivers/watchdog/ts4800_wdt.c @@ -1,11 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Watchdog driver for TS-4800 based boards * * Copyright (c) 2015 - Savoir-faire Linux * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #include <linux/kernel.h> diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c index bf918f5fa13175..3d57670befe1ce 100644 --- a/drivers/watchdog/ts72xx_wdt.c +++ b/drivers/watchdog/ts72xx_wdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Watchdog driver for Technologic Systems TS-72xx based SBCs * (TS-7200, TS-7250 and TS-7260). These boards have external @@ -8,9 +9,6 @@ * * This driver is based on ep93xx_wdt and wm831x_wdt drivers. * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #include <linux/platform_device.h>