From: Greg Ungerer <gerg@linux-m68k.org>
To: Bagas Sanjaya <bagasdotme@gmail.com>,
Linux DRI Development <dri-devel@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Networking <netdev@vger.kernel.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Linux Staging Drivers <linux-staging@lists.linux.dev>,
Linux Watchdog Devices <linux-watchdog@vger.kernel.org>,
Linux Kernel Actions <linux-actions@lists.infradead.org>
Cc: "Diederik de Haas" <didi.debian@cknow.org>,
"Kate Stewart" <kstewart@linuxfoundation.org>,
"David Airlie" <airlied@redhat.com>,
"Karsten Keil" <isdn@linux-pingi.de>,
"Jay Vosburgh" <j.vosburgh@gmail.com>,
"Andy Gospodarek" <andy@greyhouse.net>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Sam Creasey" <sammy@sammy.net>,
"Dominik Brodowski" <linux@dominikbrodowski.net>,
"Daniel Mack" <daniel@zonque.org>,
"Haojian Zhuang" <haojian.zhuang@gmail.com>,
"Robert Jarzmik" <robert.jarzmik@free.fr>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Wim Van Sebroeck" <wim@linux-watchdog.org>,
"Guenter Roeck" <linux@roeck-us.net>, "Jan Kara" <jack@suse.com>,
"Andreas Färber" <afaerber@suse.de>,
"Manivannan Sadhasivam" <mani@kernel.org>,
"Tom Rix" <trix@redhat.com>,
"Simon Horman" <simon.horman@corigine.com>,
"Yang Yingliang" <yangyingliang@huawei.com>,
"Steven Rostedt (Google)" <rostedt@goodmis.org>,
"Pavel Machek" <pavel@ucw.cz>,
"Minghao Chi" <chi.minghao@zte.com.cn>,
"Kalle Valo" <kvalo@kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Viresh Kumar" <viresh.kumar@linaro.org>,
"Arnd Bergmann" <arnd@arndb.de>, "Deepak R Varma" <drv@mailo.com>,
"Davidlohr Bueso" <dave@stgolabs.net>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Jacob Keller" <jacob.e.keller@intel.com>,
"Gaosheng Cui" <cuigaosheng1@huawei.com>,
"Dan Carpenter" <error27@gmail.com>, Archana <craechal@gmail.com>,
"David A . Hinds" <dahinds@users.sourceforge.net>,
"Donald Becker" <becker@scyld.com>,
"Peter De Schrijver" <p2@mind.be>
Subject: Re: [PATCH 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier
Date: Fri, 12 May 2023 08:56:35 +1000 [thread overview]
Message-ID: <1eb3b5cb-5906-4776-74a2-820b5b05949c@linux-m68k.org> (raw)
In-Reply-To: <20230511133406.78155-5-bagasdotme@gmail.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.
> */
next prev parent reply other threads:[~2023-05-11 22:57 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-11 13:33 [PATCH 00/10] Treewide GPL SPDX conversion (love letter to Didi) Bagas Sanjaya
2023-05-11 13:33 ` [PATCH 01/10] agp/amd64: Remove GPL distribution notice Bagas Sanjaya
2023-05-11 14:30 ` Simon Horman
2023-05-11 13:33 ` [PATCH 02/10] mISDN: Replace GPL notice boilerplate with SPDX identifier Bagas Sanjaya
2023-05-11 14:25 ` Simon Horman
2023-05-12 3:28 ` kernel test robot
2023-05-11 13:33 ` [PATCH 03/10] net: bonding: Add SPDX identifier to remaining files Bagas Sanjaya
2023-05-11 14:25 ` Simon Horman
2023-05-12 3:52 ` kernel test robot
2023-05-11 13:34 ` [PATCH 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier Bagas Sanjaya
2023-05-11 14:24 ` Simon Horman
2023-05-11 22:56 ` Greg Ungerer [this message]
2023-05-12 6:57 ` Sven-Haegar Koch
2023-05-12 7:36 ` Bagas Sanjaya
2023-05-12 4:09 ` kernel test robot
2023-05-11 13:34 ` [PATCH 05/10] net: ethernet: i825xx: " Bagas Sanjaya
2023-05-11 14:31 ` Simon Horman
2023-05-12 4:50 ` kernel test robot
2023-05-11 13:34 ` [PATCH 06/10] pcmcia: Add " Bagas Sanjaya
2023-05-11 14:34 ` Simon Horman
2023-05-12 4:50 ` kernel test robot
2023-05-11 13:34 ` [PATCH 07/10] drivers: staging: wlan-ng: Remove GPL/MPL boilerplate Bagas Sanjaya
2023-05-11 14:29 ` Simon Horman
2023-05-11 13:34 ` [PATCH 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier Bagas Sanjaya
2023-05-11 14:32 ` Simon Horman
2023-05-11 15:08 ` Guenter Roeck
2023-05-12 9:05 ` Bagas Sanjaya
2023-05-12 5:28 ` kernel test robot
2023-05-11 13:34 ` [PATCH 09/10] udf: Replace " Bagas Sanjaya
2023-05-11 14:33 ` Simon Horman
2023-05-12 5:47 ` kernel test robot
2023-05-12 13:14 ` Jan Kara
2023-05-11 13:34 ` [PATCH 10/10] include: synclink: Replace GPL " Bagas Sanjaya
2023-05-11 14:33 ` Simon Horman
2023-05-12 6:00 ` kernel test robot
2023-05-12 0:41 ` [PATCH 00/10] Treewide GPL SPDX conversion (love letter to Didi) Jakub Kicinski
2023-05-12 9:07 ` Bagas Sanjaya
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=1eb3b5cb-5906-4776-74a2-820b5b05949c@linux-m68k.org \
--to=gerg@linux-m68k.org \
--cc=afaerber@suse.de \
--cc=airlied@redhat.com \
--cc=andy@greyhouse.net \
--cc=arnd@arndb.de \
--cc=bagasdotme@gmail.com \
--cc=becker@scyld.com \
--cc=chi.minghao@zte.com.cn \
--cc=craechal@gmail.com \
--cc=cuigaosheng1@huawei.com \
--cc=dahinds@users.sourceforge.net \
--cc=daniel@zonque.org \
--cc=dave@stgolabs.net \
--cc=davem@davemloft.net \
--cc=didi.debian@cknow.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=drv@mailo.com \
--cc=edumazet@google.com \
--cc=error27@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=haojian.zhuang@gmail.com \
--cc=isdn@linux-pingi.de \
--cc=j.vosburgh@gmail.com \
--cc=jack@suse.com \
--cc=jacob.e.keller@intel.com \
--cc=kstewart@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-actions@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=linux@roeck-us.net \
--cc=mani@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=p2@mind.be \
--cc=pabeni@redhat.com \
--cc=pavel@ucw.cz \
--cc=robert.jarzmik@free.fr \
--cc=rostedt@goodmis.org \
--cc=sammy@sammy.net \
--cc=simon.horman@corigine.com \
--cc=tglx@linutronix.de \
--cc=trix@redhat.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=viresh.kumar@linaro.org \
--cc=wim@linux-watchdog.org \
--cc=yangyingliang@huawei.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®