Message-ID: <2023051205-shrouded-cymbal-7b9c@gregkh>
Date: Fri, 12 May 2023 20:21:15 +0900
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: Bagas Sanjaya <bagasdotme@...il.com>
Cc: Linux SPDX Licenses <linux-spdx@...r.kernel.org>,
	Linux DRI Development <dri-devel@...ts.freedesktop.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Networking <netdev@...r.kernel.org>,
	Linux ARM <linux-arm-kernel@...ts.infradead.org>,
	Linux Staging Drivers <linux-staging@...ts.linux.dev>,
	Linux Watchdog Devices <linux-watchdog@...r.kernel.org>,
	Linux Kernel Actions <linux-actions@...ts.infradead.org>,
	Diederik de Haas <didi.debian@...ow.org>,
	Kate Stewart <kstewart@...uxfoundation.org>,
	Philippe Ombredanne <pombredanne@...b.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	David Airlie <airlied@...hat.com>,
	Karsten Keil <isdn@...ux-pingi.de>,
	Jay Vosburgh <j.vosburgh@...il.com>,
	Andy Gospodarek <andy@...yhouse.net>,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
	Sam Creasey <sammy@...my.net>,
	Dominik Brodowski <linux@...inikbrodowski.net>,
	Daniel Mack <daniel@...que.org>,
	Haojian Zhuang <haojian.zhuang@...il.com>,
	Robert Jarzmik <robert.jarzmik@...e.fr>,
	Wim Van Sebroeck <wim@...ux-watchdog.org>,
	Guenter Roeck <linux@...ck-us.net>, Jan Kara <jack@...e.com>,
	Andreas Färber <afaerber@...e.de>,
	Manivannan Sadhasivam <mani@...nel.org>,
	Donald Becker <becker@...ld.com>,
	Michael Hipp <hippm@...ormatik.uni-tuebingen.de>,
	Richard Hirst <richard@...epie.demon.co.uk>,
	Simon Horman <simon.horman@...igine.com>
Subject: Re: [PATCH v2 05/10] net: ethernet: i825xx: Replace GPL boilerplate
 with SPDX identifier

On Fri, May 12, 2023 at 05:06:16PM +0700, Bagas Sanjaya wrote:
> 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@...ld.com>
> Cc: Michael Hipp <hippm@...ormatik.uni-tuebingen.de>
> Cc: Richard Hirst <richard@...epie.demon.co.uk>
> Cc: Sam Creasey <sammy@...my.net>
> Reviewed-by: Simon Horman <simon.horman@...igine.com>
> Signed-off-by: Bagas Sanjaya <bagasdotme@...il.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@...ld.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@...ld.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@...ld.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

As you are mixing GPL-1.0 and GPL-2.0 conversions in the same patch, you
need to break this up and provide the justification for why you choose
the specific license for each one, as you can't just lump them all
together and expect us to understand the reasoning when you didn't
provide any.

thanks,

greg k-h

Powered by blists - more mailing lists