2023-01-22 18:25:58

by Diederik de Haas

[permalink] [raw]
Subject: [PATCH] net/ethernet: Fix full name of the GPL

Signed-off-by: Diederik de Haas <[email protected]>
---
drivers/net/ethernet/8390/mac8390.c | 2 +-
drivers/net/ethernet/i825xx/sun3_82586.c | 2 +-
drivers/net/ethernet/i825xx/sun3_82586.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index 7fb819b9b89a..8b3ddc7ba5a6 100644
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
@@ -5,7 +5,7 @@
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. */
+ the GNU General Public License, incorporated herein by reference. */

/* 2000-02-28: support added for Dayna and Kinetics cards by
[email protected] */
diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
index 3909c6a0af89..f9595df610d4 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.c
+++ b/drivers/net/ethernet/i825xx/sun3_82586.c
@@ -9,7 +9,7 @@
* 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.
+ * same GNU General 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 ([email protected])
diff --git a/drivers/net/ethernet/i825xx/sun3_82586.h b/drivers/net/ethernet/i825xx/sun3_82586.h
index d82eca563266..eb1ab3ffd774 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.h
+++ b/drivers/net/ethernet/i825xx/sun3_82586.h
@@ -2,7 +2,7 @@
* 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.
+ * same GNU General Public License that covers that work.
*
* copyrights (c) 1994 by Michael Hipp ([email protected])
*
--
2.39.0



2023-01-23 10:16:14

by Simon Horman

[permalink] [raw]
Subject: Re: [PATCH] net/ethernet: Fix full name of the GPL

On Sun, Jan 22, 2023 at 07:25:32PM +0100, Diederik de Haas wrote:
> Signed-off-by: Diederik de Haas <[email protected]>
> ---
> drivers/net/ethernet/8390/mac8390.c | 2 +-
> drivers/net/ethernet/i825xx/sun3_82586.c | 2 +-
> drivers/net/ethernet/i825xx/sun3_82586.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)

Hi Diederik,

as we are here would it be better to just move to an SPDX header instead?

2023-01-23 15:27:26

by Diederik de Haas

[permalink] [raw]
Subject: Re: [PATCH] net/ethernet: Fix full name of the GPL

On Monday, 23 January 2023 11:15:59 CET Simon Horman wrote:
> On Sun, Jan 22, 2023 at 07:25:32PM +0100, Diederik de Haas wrote:
> > Signed-off-by: Diederik de Haas <[email protected]>
> > ---
> >
> > drivers/net/ethernet/8390/mac8390.c | 2 +-
> > drivers/net/ethernet/i825xx/sun3_82586.c | 2 +-
> > drivers/net/ethernet/i825xx/sun3_82586.h | 2 +-
> > 3 files changed, 3 insertions(+), 3 deletions(-)
>
> as we are here would it be better to just move to an SPDX header instead?

Hi Simon,

Yes it would be better to move to SPDX header(s) instead.
But I now think [1] that I would be (technically) changing the license and I'm
not in a position to do that.
While it may be reasonable to *assume* that GNU General Public License was
meant, I think that's not enough when it comes to legal/license issues.

So please disregard my patch submission and apologies for the noise.

Regards,
Diederik

[1] https://lore.kernel.org/lkml/2281101.Yu7Ql3qPJb@prancing-pony/


Attachments:
signature.asc (228.00 B)
This is a digitally signed message part.