| Message ID | 20230511133406.78155-5-bagasdotme@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Treewide GPL SPDX conversion (love letter to Didi) | expand |
On Thu, May 11, 2023 at 08:34:00PM +0700, Bagas Sanjaya wrote: > Replace GPL boilerplate notice on remaining files with appropriate SPDX > tag. For files mentioning COPYING, use GPL 2.0; otherwise GPL 1.0+. Reviewed-by: Simon Horman <simon.horman@corigine.com>
On 11/5/23 23:34, Bagas Sanjaya 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: Greg Ungerer <gerg@linux-m68k.org> > Cc: Simon Horman <simon.horman@corigine.com> > Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> > --- > drivers/net/ethernet/8390/8390.h | 2 ++ > drivers/net/ethernet/8390/apne.c | 7 +------ > drivers/net/ethernet/8390/axnet_cs.c | 6 +++--- > drivers/net/ethernet/8390/hydra.c | 6 ++---- > drivers/net/ethernet/8390/lib8390.c | 5 ++--- > drivers/net/ethernet/8390/mac8390.c | 6 ++---- > drivers/net/ethernet/8390/mcf8390.c | 4 +--- For mcf8390.c: Acked-by: Greg Ungerer <gerg@linux-m68k.org> > drivers/net/ethernet/8390/ne.c | 4 +--- > drivers/net/ethernet/8390/ne2k-pci.c | 8 +------- > drivers/net/ethernet/8390/pcnet_cs.c | 5 ++--- > drivers/net/ethernet/8390/smc-ultra.c | 4 +--- > drivers/net/ethernet/8390/stnic.c | 5 +---- > drivers/net/ethernet/8390/wd.c | 4 +--- > drivers/net/ethernet/8390/zorro8390.c | 7 +------ > 14 files changed, 21 insertions(+), 52 deletions(-) > > diff --git a/drivers/net/ethernet/8390/8390.h b/drivers/net/ethernet/8390/8390.h > index e5226446599884..b0e3df9779ddbb 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-or-later */ > + > /* 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..ef1f40e8801ccc 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-or-later */ > /* > * 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..937485fa87825a 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-or-later */ > + > /*====================================================================== > > 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..9fae05dd12a3e3 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-only */ > + > /* 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..14ab1e4d9a5c36 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-or-later */ > + > /* 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..e09f0f20516593 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-or-later */ > /* 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..e2dbc4b858c658 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..053c7cf201b27f 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-or-later */ > /* 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..01348d6ff47820 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-or-later */ > /* 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..0512472cf7800c 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-or-later */ > /*====================================================================== > > 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..deb869995eabf6 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-or-later */ > /* 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..31945bae451989 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..6ecd63b8f8976e 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-or-later */ > /* 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..e6abb22c82b514 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. > */
Hi Bagas,
kernel test robot noticed the following build warnings:
[auto build test WARNING on ac9a78681b921877518763ba0e89202254349d1b]
url: https://github.com/intel-lab-lkp/linux/commits/Bagas-Sanjaya/agp-amd64-Remove-GPL-distribution-notice/20230511-214307
base: ac9a78681b921877518763ba0e89202254349d1b
patch link: https://lore.kernel.org/r/20230511133406.78155-5-bagasdotme%40gmail.com
patch subject: [PATCH 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier
reproduce:
scripts/spdxcheck.py
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202305121107.Au46XZCK-lkp@intel.com/
spdxcheck warnings: (new ones prefixed by >>)
include/net/bonding.h: 1:28 Invalid License ID: GPL-1.0-or-later
drivers/isdn/mISDN/dsp_audio.c: 1:28 Invalid License ID: GPL-1.0-or-later
drivers/isdn/mISDN/dsp_blowfish.c: 1:28 Invalid License ID: GPL-1.0-or-later
drivers/isdn/mISDN/dsp_cmx.c: 1:28 Invalid License ID: GPL-1.0-or-later
drivers/isdn/mISDN/dsp_core.c: 1:28 Invalid License ID: GPL-1.0-or-later
drivers/isdn/mISDN/dsp_dtmf.c: 1:28 Invalid License ID: GPL-1.0-or-later
drivers/isdn/mISDN/dsp_tones.c: 1:28 Invalid License ID: GPL-1.0-or-later
drivers/net/bonding/bond_main.c: 1:28 Invalid License ID: GPL-1.0-or-later
drivers/net/bonding/bonding_priv.h: 1:28 Invalid License ID: GPL-1.0-or-later
>> drivers/net/ethernet/8390/8390.h: 1:28 Invalid License ID: GPL-1.0-or-later
>> drivers/net/ethernet/8390/apne.c: 1:28 Invalid License ID: GPL-1.0-or-later
>> drivers/net/ethernet/8390/axnet_cs.c: 1:28 Invalid License ID: GPL-1.0-or-later
>> drivers/net/ethernet/8390/hydra.c: 1:28 Invalid License ID: GPL-1.0-only
>> drivers/net/ethernet/8390/lib8390.c: 1:28 Invalid License ID: GPL-1.0-or-later
>> drivers/net/ethernet/8390/mac8390.c: 1:28 Invalid License ID: GPL-1.0-or-later
>> drivers/net/ethernet/8390/ne.c: 1:28 Invalid License ID: GPL-1.0-or-later
>> drivers/net/ethernet/8390/ne2k-pci.c: 1:28 Invalid License ID: GPL-1.0-or-later
>> drivers/net/ethernet/8390/pcnet_cs.c: 1:28 Invalid License ID: GPL-1.0-or-later
>> drivers/net/ethernet/8390/smc-ultra.c: 1:28 Invalid License ID: GPL-1.0-or-later
>> drivers/net/ethernet/8390/wd.c: 1:28 Invalid License ID: GPL-1.0-or-later
On Fri, 12 May 2023, Greg Ungerer wrote: > On 11/5/23 23:34, Bagas Sanjaya wrote: > > Replace GPL boilerplate notice on remaining files with appropriate SPDX > > tag. For files mentioning COPYING, use GPL 2.0; otherwise GPL 1.0+. > > --- a/drivers/net/ethernet/8390/hydra.c > > +++ b/drivers/net/ethernet/8390/hydra.c > > @@ -1,10 +1,8 @@ > > +/* SPDX-License-Identifier: GPL-1.0-only */ > > + > > /* 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 */ GPL-1.0-only does not sound correct. c'ya sven-haegar
On Fri, May 12, 2023 at 08:57:15AM +0200, Sven-Haegar Koch wrote: > On Fri, 12 May 2023, Greg Ungerer wrote: > > > On 11/5/23 23:34, Bagas Sanjaya wrote: > > > Replace GPL boilerplate notice on remaining files with appropriate SPDX > > > tag. For files mentioning COPYING, use GPL 2.0; otherwise GPL 1.0+. > > > > --- a/drivers/net/ethernet/8390/hydra.c > > > +++ b/drivers/net/ethernet/8390/hydra.c > > > @@ -1,10 +1,8 @@ > > > +/* SPDX-License-Identifier: GPL-1.0-only */ > > > + > > > /* 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 */ > > GPL-1.0-only does not sound correct. Oops, my oversight. The boilerplate above should have meant GPL 2.0 only. Thanks for reminder!
diff --git a/drivers/net/ethernet/8390/8390.h b/drivers/net/ethernet/8390/8390.h index e5226446599884..b0e3df9779ddbb 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-or-later */ + /* 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..ef1f40e8801ccc 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-or-later */ /* * 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..937485fa87825a 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-or-later */ + /*====================================================================== 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..9fae05dd12a3e3 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-only */ + /* 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..14ab1e4d9a5c36 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-or-later */ + /* 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..e09f0f20516593 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-or-later */ /* 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..e2dbc4b858c658 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..053c7cf201b27f 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-or-later */ /* 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..01348d6ff47820 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-or-later */ /* 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..0512472cf7800c 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-or-later */ /*====================================================================== 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..deb869995eabf6 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-or-later */ /* 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..31945bae451989 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..6ecd63b8f8976e 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-or-later */ /* 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..e6abb22c82b514 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. */
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: Greg Ungerer <gerg@linux-m68k.org> Cc: Simon Horman <simon.horman@corigine.com> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com> --- drivers/net/ethernet/8390/8390.h | 2 ++ drivers/net/ethernet/8390/apne.c | 7 +------ drivers/net/ethernet/8390/axnet_cs.c | 6 +++--- drivers/net/ethernet/8390/hydra.c | 6 ++---- drivers/net/ethernet/8390/lib8390.c | 5 ++--- drivers/net/ethernet/8390/mac8390.c | 6 ++---- drivers/net/ethernet/8390/mcf8390.c | 4 +--- drivers/net/ethernet/8390/ne.c | 4 +--- drivers/net/ethernet/8390/ne2k-pci.c | 8 +------- drivers/net/ethernet/8390/pcnet_cs.c | 5 ++--- drivers/net/ethernet/8390/smc-ultra.c | 4 +--- drivers/net/ethernet/8390/stnic.c | 5 +---- drivers/net/ethernet/8390/wd.c | 4 +--- drivers/net/ethernet/8390/zorro8390.c | 7 +------ 14 files changed, 21 insertions(+), 52 deletions(-)