linux-spdx.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Linux SPDX Licenses <linux-spdx@vger.kernel.org>,
	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>,
	"Philippe Ombredanne" <pombredanne@nexb.com>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"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>,
	"Bagas Sanjaya" <bagasdotme@gmail.com>,
	"Donald Becker" <becker@scyld.com>,
	"Michael Hipp" <hippm@informatik.uni-tuebingen.de>,
	"Richard Hirst" <richard@sleepie.demon.co.uk>,
	"Simon Horman" <simon.horman@corigine.com>
Subject: [PATCH v2 05/10] net: ethernet: i825xx: Replace GPL boilerplate with SPDX identifier
Date: Fri, 12 May 2023 17:06:16 +0700	[thread overview]
Message-ID: <20230512100620.36807-6-bagasdotme@gmail.com> (raw)
In-Reply-To: <20230512100620.36807-1-bagasdotme@gmail.com>

Replace unversioned GPL boilerplate notice on remaining i825xx files
with appropriate SPDX identifier. For files that contains "extension to
Linux kernel", use GPL 2.0, otherwise GPL 1.0+.

Cc: Donald Becker <becker@scyld.com>
Cc: Michael Hipp <hippm@informatik.uni-tuebingen.de>
Cc: Richard Hirst <richard@sleepie.demon.co.uk>
Cc: Sam Creasey <sammy@sammy.net>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
 drivers/net/ethernet/i825xx/82596.c      | 5 ++---
 drivers/net/ethernet/i825xx/lasi_82596.c | 5 ++---
 drivers/net/ethernet/i825xx/lib82596.c   | 5 ++---
 drivers/net/ethernet/i825xx/sun3_82586.c | 4 +---
 drivers/net/ethernet/i825xx/sun3_82586.h | 4 +---
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/drivers/net/ethernet/i825xx/82596.c b/drivers/net/ethernet/i825xx/82596.c
index 3ee89ae496d0ca..773d7aa29ef5fc 100644
--- a/drivers/net/ethernet/i825xx/82596.c
+++ b/drivers/net/ethernet/i825xx/82596.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /* 82596.c: A generic 82596 ethernet driver for linux. */
 /*
    Based on Apricot.c
@@ -31,9 +32,7 @@
    Driver skeleton
    Written 1993 by Donald Becker.
    Copyright 1993 United States Government as represented by the Director,
-   National Security Agency. This software may only be used and distributed
-   according to the terms of the GNU General Public License as modified by SRC,
-   incorporated herein by reference.
+   National Security Agency.
 
    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/i825xx/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c
index 0af70094aba341..3e53e0c243ba04 100644
--- a/drivers/net/ethernet/i825xx/lasi_82596.c
+++ b/drivers/net/ethernet/i825xx/lasi_82596.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /* lasi_82596.c -- driver for the intel 82596 ethernet controller, as
    munged into HPPA boxen .
 
@@ -59,9 +60,7 @@
    Driver skeleton
    Written 1993 by Donald Becker.
    Copyright 1993 United States Government as represented by the Director,
-   National Security Agency. This software may only be used and distributed
-   according to the terms of the GNU General Public License as modified by SRC,
-   incorporated herein by reference.
+   National Security Agency.
 
    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/i825xx/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c
index ca2fb303fcc6f6..67d248a7a6f49e 100644
--- a/drivers/net/ethernet/i825xx/lib82596.c
+++ b/drivers/net/ethernet/i825xx/lib82596.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-1.0+
 /* lasi_82596.c -- driver for the intel 82596 ethernet controller, as
    munged into HPPA boxen .
 
@@ -59,9 +60,7 @@
    Driver skeleton
    Written 1993 by Donald Becker.
    Copyright 1993 United States Government as represented by the Director,
-   National Security Agency. This software may only be used and distributed
-   according to the terms of the GNU General Public License as modified by SRC,
-   incorporated herein by reference.
+   National Security Agency.
 
    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/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
index 3909c6a0af89f9..f05f016cb3b0ea 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.c
+++ b/drivers/net/ethernet/i825xx/sun3_82586.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Sun3 i82586 Ethernet driver
  *
@@ -8,9 +9,6 @@
  *
  * net-3-driver for the NI5210 card (i82586 Ethernet chip)
  *
- * This is an extension to the Linux operating system, and is covered by the
- * same Gnu Public License that covers that work.
- *
  * Alphacode 0.82 (96/09/29) for Linux 2.0.0 (or later)
  * Copyrights (c) 1994,1995,1996 by M.Hipp (hippm@informatik.uni-tuebingen.de)
  * --------------------------
diff --git a/drivers/net/ethernet/i825xx/sun3_82586.h b/drivers/net/ethernet/i825xx/sun3_82586.h
index d82eca563266a1..82702b32c61fec 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.h
+++ b/drivers/net/ethernet/i825xx/sun3_82586.h
@@ -1,9 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Intel i82586 Ethernet definitions
  *
- * This is an extension to the Linux operating system, and is covered by the
- * same Gnu Public License that covers that work.
- *
  * copyrights (c) 1994 by Michael Hipp (hippm@informatik.uni-tuebingen.de)
  *
  * I have done a look in the following sources:
-- 
An old man doll... just what I always wanted! - Clara


  parent reply	other threads:[~2023-05-12 10:07 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-12 10:06 [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 01/10] agp/amd64: Remove GPL distribution notice Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 02/10] mISDN: Replace GPL notice boilerplate with SPDX identifier Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 03/10] net: bonding: Add SPDX identifier to remaining files Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier Bagas Sanjaya
2023-05-12 11:27   ` Geert Uytterhoeven
2023-05-12 13:03   ` Richard Fontana
2023-05-12 10:06 ` Bagas Sanjaya [this message]
2023-05-12 11:21   ` [PATCH v2 05/10] net: ethernet: i825xx: " Greg Kroah-Hartman
2023-05-12 10:06 ` [PATCH v2 06/10] pcmcia: Add " Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 07/10] drivers: staging: wlan-ng: Remove GPL/MPL boilerplate Bagas Sanjaya
2023-05-12 10:06 ` [PATCH v2 08/10] drivers: watchdog: Replace GPL license notice with SPDX identifier Bagas Sanjaya
2023-05-12 12:46   ` Richard Fontana
2023-05-13 10:52     ` Bagas Sanjaya
2023-05-13 13:43       ` Richard Fontana
2023-05-13 15:07         ` Greg Kroah-Hartman
2023-05-14 13:08           ` Guenter Roeck
2023-05-12 12:49   ` Guenter Roeck
2023-05-12 12:50   ` Bagas Sanjaya
2023-05-12 13:14   ` Andreas Färber
2023-05-12 10:06 ` [PATCH v2 09/10] udf: Replace " Bagas Sanjaya
2023-05-12 13:21   ` Richard Fontana
2023-05-13  9:31     ` Bagas Sanjaya
2023-05-13  9:48   ` Pali Rohár
2023-05-13  9:59     ` Greg Kroah-Hartman
2023-05-12 10:06 ` [PATCH v2 10/10] include: synclink: Replace GPL " Bagas Sanjaya
2023-05-12 11:23 ` [PATCH v2 00/10] Treewide GPL SPDX conversion and cleanup (in response to Didi's GPL full name fixes) Greg Kroah-Hartman
2023-05-13  9:25   ` 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=20230512100620.36807-6-bagasdotme@gmail.com \
    --to=bagasdotme@gmail.com \
    --cc=afaerber@suse.de \
    --cc=airlied@redhat.com \
    --cc=andy@greyhouse.net \
    --cc=becker@scyld.com \
    --cc=daniel@zonque.org \
    --cc=davem@davemloft.net \
    --cc=didi.debian@cknow.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=edumazet@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=haojian.zhuang@gmail.com \
    --cc=hippm@informatik.uni-tuebingen.de \
    --cc=isdn@linux-pingi.de \
    --cc=j.vosburgh@gmail.com \
    --cc=jack@suse.com \
    --cc=kstewart@linuxfoundation.org \
    --cc=kuba@kernel.org \
    --cc=linux-actions@lists.infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spdx@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=pabeni@redhat.com \
    --cc=pombredanne@nexb.com \
    --cc=richard@sleepie.demon.co.uk \
    --cc=robert.jarzmik@free.fr \
    --cc=sammy@sammy.net \
    --cc=simon.horman@corigine.com \
    --cc=tglx@linutronix.de \
    --cc=wim@linux-watchdog.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).