[net,4/5] net: ethernet: i825xx: Replace unversioned GPL (GPL 1.0) notice with SPDX identifier

Message ID 20230515060714.621952-5-bagasdotme@gmail.com
State New
Headers
Series SPDX conversion for bonding, 8390, and i825xx drivers |

Commit Message

Bagas Sanjaya May 15, 2023, 6:07 a.m. UTC
  Replace unversioned GPL boilerplate notice with corresponding SPDX
license identifier, which is GPL 1.0+.

Cc: Donald Becker <becker@scyld.com>
Cc: Richard Hirst <richard@sleepie.demon.co.uk>
Cc: Sam Creasey <sammy@sammy.net>
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 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)
  

Comments

Geert Uytterhoeven May 17, 2023, 11:21 a.m. UTC | #1
Hi Bagas,

On Mon, May 15, 2023 at 8:19 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
> Replace unversioned GPL boilerplate notice with corresponding SPDX
> license identifier, which is GPL 1.0+.
>
> Cc: Donald Becker <becker@scyld.com>
> Cc: Richard Hirst <richard@sleepie.demon.co.uk>
> Cc: Sam Creasey <sammy@sammy.net>
> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>

Thanks for your patch, which is now commit 9ac40d080befb4a0 ("net:
ethernet: i825xx: Replace unversioned GPL (GPL 1.0) notice with SPDX
identifier") in net-next/main and next-20230517.

>  drivers/net/ethernet/i825xx/82596.c      | 5 ++---
>  drivers/net/ethernet/i825xx/lasi_82596.c | 5 ++---
>  drivers/net/ethernet/i825xx/lib82596.c   | 5 ++---
>  3 files changed, 6 insertions(+), 9 deletions(-)

> --- 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.

This file is not licensed under the "unversioned GPL", but
under the "GNU General Public License as modified by SRC".
Cfr. https://elixir.bootlin.com/linux/latest/source/drivers/net/LICENSE.SRC
Hence you removed important legal information.

Same for the two other files.

>
>     The author may be reached as becker@scyld.com, or C/O
>     Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403

Gr{oetje,eeting}s,

                        Geert
  
Bagas Sanjaya May 19, 2023, 10:57 a.m. UTC | #2
On 5/17/23 18:21, Geert Uytterhoeven wrote:
> Hi Bagas,
> 
> On Mon, May 15, 2023 at 8:19 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
>> Replace unversioned GPL boilerplate notice with corresponding SPDX
>> license identifier, which is GPL 1.0+.
>>
>> Cc: Donald Becker <becker@scyld.com>
>> Cc: Richard Hirst <richard@sleepie.demon.co.uk>
>> Cc: Sam Creasey <sammy@sammy.net>
>> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
> 
> Thanks for your patch, which is now commit 9ac40d080befb4a0 ("net:
> ethernet: i825xx: Replace unversioned GPL (GPL 1.0) notice with SPDX
> identifier") in net-next/main and next-20230517.
> 
>>  drivers/net/ethernet/i825xx/82596.c      | 5 ++---
>>  drivers/net/ethernet/i825xx/lasi_82596.c | 5 ++---
>>  drivers/net/ethernet/i825xx/lib82596.c   | 5 ++---
>>  3 files changed, 6 insertions(+), 9 deletions(-)
> 
>> --- 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.
> 
> This file is not licensed under the "unversioned GPL", but
> under the "GNU General Public License as modified by SRC".
> Cfr. https://elixir.bootlin.com/linux/latest/source/drivers/net/LICENSE.SRC
> Hence you removed important legal information.
> 
> Same for the two other files.
> 

Oops, thanks for pointing it out!

I included Donald Becker in Cc to ask if this conversion is OK,
but emails to him (including this patch series) bounced (unreachable
domain).
  

Patch

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