| Message ID | 20230512100620.36807-5-bagasdotme@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) | expand |
Hi Bagas, On Fri, May 12, 2023 at 12:08 PM Bagas Sanjaya <bagasdotme@gmail.com> wrote: > Replace GPL boilerplate notice on remaining files with appropriate SPDX > tag. For files mentioning COPYING, use GPL 2.0; otherwise GPL 1.0+. > > Cc: David A. Hinds <dahinds@users.sourceforge.net> > Cc: Donald Becker <becker@scyld.com> > Cc: Peter De Schrijver <p2@mind.be> > Cc: Topi Kanerva <topi@susanna.oulu.fi> > Cc: Alain Malek <Alain.Malek@cryogen.com> > Cc: Bruce Abbott <bhabbott@inhb.co.nz> > Cc: Alan Cox <alan@linux.intel.com> > Acked-by: Greg Ungerer <gerg@linux-m68k.org> > Reviewed-by: Simon Horman <simon.horman@corigine.com> > Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> Thanks for your patch! > --- a/drivers/net/ethernet/8390/apne.c > +++ b/drivers/net/ethernet/8390/apne.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-1.0+ As per the removed lines below, this should be GPL-2.0-only. > /* > * Amiga Linux/68k 8390 based PCMCIA Ethernet Driver for the Amiga 1200 > * > @@ -19,12 +20,6 @@ > * > * ---------------------------------------------------------------------------- > * > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file COPYING in the main directory of the Linux > - * distribution for more details. > - * > - * ---------------------------------------------------------------------------- > - * > */ > > > --- a/drivers/net/ethernet/8390/hydra.c > +++ b/drivers/net/ethernet/8390/hydra.c > @@ -1,10 +1,8 @@ > +// SPDX-License-Identifier: GPL-1.0+ Likewise. > + > /* New Hydra driver using generic 8390 core */ > /* Based on old hydra driver by Topi Kanerva (topi@susanna.oulu.fi) */ > > -/* This file is subject to the terms and conditions of the GNU General */ > -/* Public License. See the file COPYING in the main directory of the */ > -/* Linux distribution for more details. */ > - > /* Peter De Schrijver (p2@mind.be) */ > /* Oldenburg 2000 */ > Gr{oetje,eeting}s, Geert
On Fri, May 12, 2023 at 6:07 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote: > > Replace GPL boilerplate notice on remaining files with appropriate SPDX > tag. For files mentioning COPYING, use GPL 2.0; otherwise GPL 1.0+. > diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c > index 6a0a2039600a0a..ea3488e81c5f3c 100644 > --- a/drivers/net/ethernet/8390/ne2k-pci.c > +++ b/drivers/net/ethernet/8390/ne2k-pci.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-1.0+ > /* A Linux device driver for PCI NE2000 clones. > * > * Authors and other copyright holders: > @@ -6,13 +7,6 @@ > * Copyright 1993 assigned to the United States Government as represented > * by the Director, National Security Agency. > * > - * This software may be used and distributed according to the terms of > - * the GNU General Public License (GPL), incorporated herein by reference. > - * Drivers based on or derived from this code fall under the GPL and must > - * retain the authorship, copyright and license notice. This file is not > - * a complete program and may only be used when the entire operating > - * system is licensed under the GPL. I don't think you should delete those last two sentences. "Drivers based on or derived from this code fall under the GPL and must retain the authorship, copyright and license notice." The notice has: * Authors and other copyright holders: * 1992-2000 by Donald Becker, NE2000 core and various modifications. * 1995-1998 by Paul Gortmaker, core modifications and PCI support. * Copyright 1993 assigned to the United States Government as represented * by the Director, National Security Agency. Nothing in the GPL requires retention of "authorship", as some other licenses do (you can argue that GPLv2 conflates authorship with copyright ownership, but this sentence seems to distinguish "authorship" from "copyright" as does the listing of authors). There is (arguably) a tradition of treating extra author attribution requirements as legitimate, but if you view them as extra requirements you can't, or shouldn't, just remove them arbitrarily. Then there's this: "This file is not a complete program and may only be used when the entire operating system is licensed under the GPL." Whether or not that's a correct statement of GPL interpretation (perhaps it depends on the meaning of "entire operating system"), it's significant enough as a nonstandard interpretive comment that I think you should probably not remove it. Richard
diff --git a/drivers/net/ethernet/8390/8390.h b/drivers/net/ethernet/8390/8390.h index e5226446599884..f784a6e2ab0ed3 100644 --- a/drivers/net/ethernet/8390/8390.h +++ b/drivers/net/ethernet/8390/8390.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-1.0+ */ + /* Generic NS8390 register definitions. */ /* This file is part of Donald Becker's 8390 drivers, and is distributed diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c index 991ad953aa7906..bf9a95875b0b20 100644 --- a/drivers/net/ethernet/8390/apne.c +++ b/drivers/net/ethernet/8390/apne.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * Amiga Linux/68k 8390 based PCMCIA Ethernet Driver for the Amiga 1200 * @@ -19,12 +20,6 @@ * * ---------------------------------------------------------------------------- * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of the Linux - * distribution for more details. - * - * ---------------------------------------------------------------------------- - * */ diff --git a/drivers/net/ethernet/8390/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c index 78f985885547ea..fea489af72fb0b 100644 --- a/drivers/net/ethernet/8390/axnet_cs.c +++ b/drivers/net/ethernet/8390/axnet_cs.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-1.0+ + /*====================================================================== A PCMCIA ethernet driver for Asix AX88190-based cards @@ -17,9 +19,7 @@ Written 1992,1993 by Donald Becker. Copyright 1993 United States Government as represented by the - Director, National Security Agency. This software may be used and - distributed according to the terms of the GNU General Public License, - incorporated herein by reference. + Director, National Security Agency. Donald Becker may be reached at becker@scyld.com ======================================================================*/ diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c index 1df7601af86a40..1c3dd9a2847543 100644 --- a/drivers/net/ethernet/8390/hydra.c +++ b/drivers/net/ethernet/8390/hydra.c @@ -1,10 +1,8 @@ +// SPDX-License-Identifier: GPL-1.0+ + /* New Hydra driver using generic 8390 core */ /* Based on old hydra driver by Topi Kanerva (topi@susanna.oulu.fi) */ -/* This file is subject to the terms and conditions of the GNU General */ -/* Public License. See the file COPYING in the main directory of the */ -/* Linux distribution for more details. */ - /* Peter De Schrijver (p2@mind.be) */ /* Oldenburg 2000 */ diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c index e84021282edf30..84aeb8054304f9 100644 --- a/drivers/net/ethernet/8390/lib8390.c +++ b/drivers/net/ethernet/8390/lib8390.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-1.0+ + /* 8390.c: A general NS8390 ethernet driver core for linux. */ /* Written 1992-94 by Donald Becker. @@ -5,9 +7,6 @@ Copyright 1993 United States Government as represented by the Director, National Security Agency. - This software may be used and distributed according to the terms - of the GNU General Public License, incorporated herein by reference. - The author may be reached as becker@scyld.com, or C/O Scyld Computing Corporation 410 Severn Ave., Suite 210 diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c index 7fb819b9b89a5b..4a0a095a1a8a0a 100644 --- a/drivers/net/ethernet/8390/mac8390.c +++ b/drivers/net/ethernet/8390/mac8390.c @@ -1,11 +1,9 @@ +// SPDX-License-Identifier: GPL-1.0+ /* mac8390.c: New driver for 8390-based Nubus (or Nubus-alike) Ethernet cards on Linux */ /* Based on the former daynaport.c driver, by Alan Cox. Some code taken from or inspired by skeleton.c by Donald Becker, acenic.c by - Jes Sorensen, and ne2k-pci.c by Donald Becker and Paul Gortmaker. - - This software may be used and distributed according to the terms of - the GNU Public License, incorporated herein by reference. */ + Jes Sorensen, and ne2k-pci.c by Donald Becker and Paul Gortmaker. */ /* 2000-02-28: support added for Dayna and Kinetics cards by A.G.deWijn@phys.uu.nl */ diff --git a/drivers/net/ethernet/8390/mcf8390.c b/drivers/net/ethernet/8390/mcf8390.c index 8a7918d3341965..217838b2822025 100644 --- a/drivers/net/ethernet/8390/mcf8390.c +++ b/drivers/net/ethernet/8390/mcf8390.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Support for ColdFire CPU based boards using a NS8390 Ethernet device. * @@ -5,9 +6,6 @@ * * (C) Copyright 2012, Greg Ungerer <gerg@uclinux.org> * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of the Linux - * distribution for more details. */ #include <linux/module.h> diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c index 0a9118b8be0c64..cb04a3071f92d4 100644 --- a/drivers/net/ethernet/8390/ne.c +++ b/drivers/net/ethernet/8390/ne.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* ne.c: A general non-shared-memory NS8390 ethernet driver for linux. */ /* Written 1992-94 by Donald Becker. @@ -5,9 +6,6 @@ Copyright 1993 United States Government as represented by the Director, National Security Agency. - This software may be used and distributed according to the terms - of the GNU General Public License, incorporated herein by reference. - The author may be reached as becker@scyld.com, or C/O Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403 diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c index 6a0a2039600a0a..ea3488e81c5f3c 100644 --- a/drivers/net/ethernet/8390/ne2k-pci.c +++ b/drivers/net/ethernet/8390/ne2k-pci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* A Linux device driver for PCI NE2000 clones. * * Authors and other copyright holders: @@ -6,13 +7,6 @@ * Copyright 1993 assigned to the United States Government as represented * by the Director, National Security Agency. * - * This software may be used and distributed according to the terms of - * the GNU General Public License (GPL), incorporated herein by reference. - * Drivers based on or derived from this code fall under the GPL and must - * retain the authorship, copyright and license notice. This file is not - * a complete program and may only be used when the entire operating - * system is licensed under the GPL. - * * The author may be reached as becker@scyld.com, or C/O * Scyld Computing Corporation * 410 Severn Ave., Suite 210 diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c index 0f07fe03da98c8..9bd5e991f1e52b 100644 --- a/drivers/net/ethernet/8390/pcnet_cs.c +++ b/drivers/net/ethernet/8390/pcnet_cs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /*====================================================================== A PCMCIA ethernet driver for NS8390-based cards @@ -17,9 +18,7 @@ Written 1992,1993 by Donald Becker. Copyright 1993 United States Government as represented by the - Director, National Security Agency. This software may be used and - distributed according to the terms of the GNU General Public License, - incorporated herein by reference. + Director, National Security Agency. Donald Becker may be reached at becker@scyld.com Based also on Keith Moore's changes to Don Becker's code, for IBM diff --git a/drivers/net/ethernet/8390/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c index 6e62c37c940056..ae10b7de41e8f1 100644 --- a/drivers/net/ethernet/8390/smc-ultra.c +++ b/drivers/net/ethernet/8390/smc-ultra.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* smc-ultra.c: A SMC Ultra ethernet driver for linux. */ /* This is a driver for the SMC Ultra and SMC EtherEZ ISA ethercards. @@ -7,9 +8,6 @@ Copyright 1993 United States Government as represented by the Director, National Security Agency. - This software may be used and distributed according to the terms - of the GNU General Public License, incorporated herein by reference. - The author may be reached as becker@scyld.com, or C/O Scyld Computing Corporation 410 Severn Ave., Suite 210 diff --git a/drivers/net/ethernet/8390/stnic.c b/drivers/net/ethernet/8390/stnic.c index bd89ca8a92dfbc..265976e3b64ab2 100644 --- a/drivers/net/ethernet/8390/stnic.c +++ b/drivers/net/ethernet/8390/stnic.c @@ -1,8 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* stnic.c : A SH7750 specific part of driver for NS DP83902A ST-NIC. - * - * 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) 1999 kaz Kojima */ diff --git a/drivers/net/ethernet/8390/wd.c b/drivers/net/ethernet/8390/wd.c index 5b00c452bede64..9a36667d00b65c 100644 --- a/drivers/net/ethernet/8390/wd.c +++ b/drivers/net/ethernet/8390/wd.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* wd.c: A WD80x3 ethernet driver for linux. */ /* Written 1993-94 by Donald Becker. @@ -5,9 +6,6 @@ Copyright 1993 United States Government as represented by the Director, National Security Agency. - This software may be used and distributed according to the terms - of the GNU General Public License, incorporated herein by reference. - The author may be reached as becker@scyld.com, or C/O Scyld Computing Corporation 410 Severn Ave., Suite 210 diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c index e8b4fe813a0828..d70390e9d03d9b 100644 --- a/drivers/net/ethernet/8390/zorro8390.c +++ b/drivers/net/ethernet/8390/zorro8390.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Amiga Linux/m68k and Linux/PPC Zorro NS8390 Ethernet Driver * @@ -9,12 +10,6 @@ * * --------------------------------------------------------------------------- * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of the Linux - * distribution for more details. - * - * --------------------------------------------------------------------------- - * * The Ariadne II and X-Surf are Zorro-II boards containing Realtek RTL8019AS * Ethernet Controllers. */