| Message ID | 1517945663-3214-1-git-send-email-shannon.nelson@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] sun: Add SPDX license tags to Sun network drivers | expand |
Reviewed-by: Zhu Yanjun <yanjun.zhu@oracle.com> On Wed, Feb 7, 2018 at 3:34 AM, Shannon Nelson <shannon.nelson@oracle.com> wrote: > Add the appropriate SPDX license tags to the Sun network drivers > as outlined in Documentation/process/license-rules.rst. > > Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> > --- > drivers/net/ethernet/sun/Kconfig | 1 + > drivers/net/ethernet/sun/cassini.c | 1 + > drivers/net/ethernet/sun/cassini.h | 1 + > drivers/net/ethernet/sun/ldmvsw.c | 1 + > drivers/net/ethernet/sun/niu.c | 1 + > drivers/net/ethernet/sun/sunbmac.c | 1 + > drivers/net/ethernet/sun/sungem.c | 1 + > drivers/net/ethernet/sun/sunhme.c | 1 + > drivers/net/ethernet/sun/sunqe.c | 1 + > drivers/net/ethernet/sun/sunvnet.c | 1 + > drivers/net/ethernet/sun/sunvnet_common.c | 1 + > 11 files changed, 11 insertions(+) > > diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig > index b2caf51..7b982e0 100644 > --- a/drivers/net/ethernet/sun/Kconfig > +++ b/drivers/net/ethernet/sun/Kconfig > @@ -1,3 +1,4 @@ > +# SPDX-License-Identifier: GPL-2.0 > # > # Sun network device configuration > # > diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c > index 113bd57..9020b08 100644 > --- a/drivers/net/ethernet/sun/cassini.c > +++ b/drivers/net/ethernet/sun/cassini.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* cassini.c: Sun Microsystems Cassini(+) ethernet driver. > * > * Copyright (C) 2004 Sun Microsystems Inc. > diff --git a/drivers/net/ethernet/sun/cassini.h b/drivers/net/ethernet/sun/cassini.h > index 882ce16..13f3860 100644 > --- a/drivers/net/ethernet/sun/cassini.h > +++ b/drivers/net/ethernet/sun/cassini.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > /* $Id: cassini.h,v 1.16 2004/08/17 21:15:16 zaumen Exp $ > * cassini.h: Definitions for Sun Microsystems Cassini(+) ethernet driver. > * > diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c > index 5ea0376..a5dd627 100644 > --- a/drivers/net/ethernet/sun/ldmvsw.c > +++ b/drivers/net/ethernet/sun/ldmvsw.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* ldmvsw.c: Sun4v LDOM Virtual Switch Driver. > * > * Copyright (C) 2016-2017 Oracle. All rights reserved. > diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c > index 06001ba..8dd545f 100644 > --- a/drivers/net/ethernet/sun/niu.c > +++ b/drivers/net/ethernet/sun/niu.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* niu.c: Neptune ethernet driver. > * > * Copyright (C) 2007, 2008 David S. Miller (davem@davemloft.net) > diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c > index 0b1f41f..f047b27 100644 > --- a/drivers/net/ethernet/sun/sunbmac.c > +++ b/drivers/net/ethernet/sun/sunbmac.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* sunbmac.c: Driver for Sparc BigMAC 100baseT ethernet adapters. > * > * Copyright (C) 1997, 1998, 1999, 2003, 2008 David S. Miller (davem@davemloft.net) > diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c > index a7afcee..7a16d40 100644 > --- a/drivers/net/ethernet/sun/sungem.c > +++ b/drivers/net/ethernet/sun/sungem.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* $Id: sungem.c,v 1.44.2.22 2002/03/13 01:18:12 davem Exp $ > * sungem.c: Sun GEM ethernet driver. > * > diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c > index 0431f1e..06da2f5 100644 > --- a/drivers/net/ethernet/sun/sunhme.c > +++ b/drivers/net/ethernet/sun/sunhme.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* sunhme.c: Sparc HME/BigMac 10/100baseT half/full duplex auto switching, > * auto carrier detecting ethernet driver. Also known as the > * "Happy Meal Ethernet" found on SunSwift SBUS cards. > diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c > index a6bcdcd..7fe0d5e 100644 > --- a/drivers/net/ethernet/sun/sunqe.c > +++ b/drivers/net/ethernet/sun/sunqe.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* sunqe.c: Sparc QuadEthernet 10baseT SBUS card driver. > * Once again I am out to prove that every ethernet > * controller out there can be most efficiently programmed > diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c > index 27fb226..63d3d6b 100644 > --- a/drivers/net/ethernet/sun/sunvnet.c > +++ b/drivers/net/ethernet/sun/sunvnet.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* sunvnet.c: Sun LDOM Virtual Network Driver. > * > * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net> > diff --git a/drivers/net/ethernet/sun/sunvnet_common.c b/drivers/net/ethernet/sun/sunvnet_common.c > index 8aa3ce4..d8f4c3f 100644 > --- a/drivers/net/ethernet/sun/sunvnet_common.c > +++ b/drivers/net/ethernet/sun/sunvnet_common.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* sunvnet.c: Sun LDOM Virtual Network Driver. > * > * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net> > -- > 2.7.4 >
Hi Shannon, On Wed, Feb 7, 2018 at 6:34 AM, Shannon Nelson <shannon.nelson@oracle.com> wrote: > Add the appropriate SPDX license tags to the Sun network drivers > as outlined in Documentation/process/license-rules.rst. > > Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> > --- > drivers/net/ethernet/sun/Kconfig | 1 + > drivers/net/ethernet/sun/cassini.c | 1 + > drivers/net/ethernet/sun/cassini.h | 1 + > drivers/net/ethernet/sun/ldmvsw.c | 1 + > drivers/net/ethernet/sun/niu.c | 1 + > drivers/net/ethernet/sun/sunbmac.c | 1 + > drivers/net/ethernet/sun/sungem.c | 1 + > drivers/net/ethernet/sun/sunhme.c | 1 + > drivers/net/ethernet/sun/sunqe.c | 1 + > drivers/net/ethernet/sun/sunvnet.c | 1 + > drivers/net/ethernet/sun/sunvnet_common.c | 1 + > 11 files changed, 11 insertions(+) > > diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig > index b2caf51..7b982e0 100644 > --- a/drivers/net/ethernet/sun/Kconfig > +++ b/drivers/net/ethernet/sun/Kconfig > @@ -1,3 +1,4 @@ > +# SPDX-License-Identifier: GPL-2.0 > # > # Sun network device configuration > # I'm not sure that Kconfig files count as source, right? > diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c > index 113bd57..9020b08 100644 > --- a/drivers/net/ethernet/sun/cassini.c > +++ b/drivers/net/ethernet/sun/cassini.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* cassini.c: Sun Microsystems Cassini(+) ethernet driver. > * > * Copyright (C) 2004 Sun Microsystems Inc. I understand that this is the specified way to do this, but it's exceptionally ugly. Also, shouldn't the SPDX line _replace_ the usual "this program is free software" license paragraphs? My understanding is that the SPDX line is functionally equivalent to having the terms spelled out. Thanks,
On 2/7/2018 3:59 AM, Julian Calaby wrote: > Hi Shannon, > > On Wed, Feb 7, 2018 at 6:34 AM, Shannon Nelson > <shannon.nelson@oracle.com> wrote: >> Add the appropriate SPDX license tags to the Sun network drivers >> as outlined in Documentation/process/license-rules.rst. >> >> Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> >> --- >> drivers/net/ethernet/sun/Kconfig | 1 + >> drivers/net/ethernet/sun/cassini.c | 1 + >> drivers/net/ethernet/sun/cassini.h | 1 + >> drivers/net/ethernet/sun/ldmvsw.c | 1 + >> drivers/net/ethernet/sun/niu.c | 1 + >> drivers/net/ethernet/sun/sunbmac.c | 1 + >> drivers/net/ethernet/sun/sungem.c | 1 + >> drivers/net/ethernet/sun/sunhme.c | 1 + >> drivers/net/ethernet/sun/sunqe.c | 1 + >> drivers/net/ethernet/sun/sunvnet.c | 1 + >> drivers/net/ethernet/sun/sunvnet_common.c | 1 + >> 11 files changed, 11 insertions(+) >> >> diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig >> index b2caf51..7b982e0 100644 >> --- a/drivers/net/ethernet/sun/Kconfig >> +++ b/drivers/net/ethernet/sun/Kconfig >> @@ -1,3 +1,4 @@ >> +# SPDX-License-Identifier: GPL-2.0 >> # >> # Sun network device configuration >> # > > I'm not sure that Kconfig files count as source, right? My read of license-rules.rst and the existing examples such as ./Kconfig, ./drivers/Kconfig, and many others, suggest this is a correct patch. > >> diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c >> index 113bd57..9020b08 100644 >> --- a/drivers/net/ethernet/sun/cassini.c >> +++ b/drivers/net/ethernet/sun/cassini.c >> @@ -1,3 +1,4 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> /* cassini.c: Sun Microsystems Cassini(+) ethernet driver. >> * >> * Copyright (C) 2004 Sun Microsystems Inc. > > I understand that this is the specified way to do this, but it's > exceptionally ugly. > > Also, shouldn't the SPDX line _replace_ the usual "this program is > free software" license paragraphs? My understanding is that the SPDX > line is functionally equivalent to having the terms spelled out. Yes, the SPDX line is intended to suffice as the licensing in those files where there is no other licensing statement. Where there already is a statement of some sort, I'm following the wisdom and example of those who've been working on this before me: if GregKH and others are happy with adding one line and leaving the rest, I'm happy with it. sln > > Thanks, >
On 7 February 2018 at 17:18, Shannon Nelson <shannon.nelson@oracle.com> wrote: > On 2/7/2018 3:59 AM, Julian Calaby wrote: >> >> Hi Shannon, >> >> On Wed, Feb 7, 2018 at 6:34 AM, Shannon Nelson >> <shannon.nelson@oracle.com> wrote: >>> >>> Add the appropriate SPDX license tags to the Sun network drivers >>> as outlined in Documentation/process/license-rules.rst. >>> >>> Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> >>> --- >>> drivers/net/ethernet/sun/Kconfig | 1 + >>> drivers/net/ethernet/sun/cassini.c | 1 + >>> drivers/net/ethernet/sun/cassini.h | 1 + >>> drivers/net/ethernet/sun/ldmvsw.c | 1 + >>> drivers/net/ethernet/sun/niu.c | 1 + >>> drivers/net/ethernet/sun/sunbmac.c | 1 + >>> drivers/net/ethernet/sun/sungem.c | 1 + >>> drivers/net/ethernet/sun/sunhme.c | 1 + >>> drivers/net/ethernet/sun/sunqe.c | 1 + >>> drivers/net/ethernet/sun/sunvnet.c | 1 + >>> drivers/net/ethernet/sun/sunvnet_common.c | 1 + >>> 11 files changed, 11 insertions(+) >>> >>> diff --git a/drivers/net/ethernet/sun/Kconfig >>> b/drivers/net/ethernet/sun/Kconfig >>> index b2caf51..7b982e0 100644 >>> --- a/drivers/net/ethernet/sun/Kconfig >>> +++ b/drivers/net/ethernet/sun/Kconfig >>> @@ -1,3 +1,4 @@ >>> +# SPDX-License-Identifier: GPL-2.0 >>> # >>> # Sun network device configuration >>> # >> >> >> I'm not sure that Kconfig files count as source, right? > > > My read of license-rules.rst and the existing examples such as ./Kconfig, > ./drivers/Kconfig, and many others, suggest this is a correct patch. > >> >>> diff --git a/drivers/net/ethernet/sun/cassini.c >>> b/drivers/net/ethernet/sun/cassini.c >>> index 113bd57..9020b08 100644 >>> --- a/drivers/net/ethernet/sun/cassini.c >>> +++ b/drivers/net/ethernet/sun/cassini.c >>> @@ -1,3 +1,4 @@ >>> +// SPDX-License-Identifier: GPL-2.0 >>> /* cassini.c: Sun Microsystems Cassini(+) ethernet driver. >>> * >>> * Copyright (C) 2004 Sun Microsystems Inc. >> >> >> I understand that this is the specified way to do this, but it's >> exceptionally ugly. >> >> Also, shouldn't the SPDX line _replace_ the usual "this program is >> free software" license paragraphs? My understanding is that the SPDX >> line is functionally equivalent to having the terms spelled out. > > > Yes, the SPDX line is intended to suffice as the licensing in those files > where there is no other licensing statement. Where there already is a > statement of some sort, I'm following the wisdom and example of those who've > been working on this before me: if GregKH and others are happy with adding > one line and leaving the rest, I'm happy with it. > > sln > >> >> Thanks, >> Hi everyone I had a look at the SPDX webpage (https://spdx.org/licenses/) and 'GPL-2.0' is listed as a deprecated identifier as of 5.jan 2018. I guess this will be a issue when using an externally managed identifier for licensing. - Kjetil Oftedal
From: Shannon Nelson <shannon.nelson@oracle.com> Date: Tue, 6 Feb 2018 11:34:23 -0800 > Add the appropriate SPDX license tags to the Sun network drivers > as outlined in Documentation/process/license-rules.rst. > > Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> I've decided to apply this to the net tree, thank you.
diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig index b2caf51..7b982e0 100644 --- a/drivers/net/ethernet/sun/Kconfig +++ b/drivers/net/ethernet/sun/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Sun network device configuration # diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index 113bd57..9020b08 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* cassini.c: Sun Microsystems Cassini(+) ethernet driver. * * Copyright (C) 2004 Sun Microsystems Inc. diff --git a/drivers/net/ethernet/sun/cassini.h b/drivers/net/ethernet/sun/cassini.h index 882ce16..13f3860 100644 --- a/drivers/net/ethernet/sun/cassini.h +++ b/drivers/net/ethernet/sun/cassini.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* $Id: cassini.h,v 1.16 2004/08/17 21:15:16 zaumen Exp $ * cassini.h: Definitions for Sun Microsystems Cassini(+) ethernet driver. * diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c index 5ea0376..a5dd627 100644 --- a/drivers/net/ethernet/sun/ldmvsw.c +++ b/drivers/net/ethernet/sun/ldmvsw.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* ldmvsw.c: Sun4v LDOM Virtual Switch Driver. * * Copyright (C) 2016-2017 Oracle. All rights reserved. diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 06001ba..8dd545f 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* niu.c: Neptune ethernet driver. * * Copyright (C) 2007, 2008 David S. Miller (davem@davemloft.net) diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c index 0b1f41f..f047b27 100644 --- a/drivers/net/ethernet/sun/sunbmac.c +++ b/drivers/net/ethernet/sun/sunbmac.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* sunbmac.c: Driver for Sparc BigMAC 100baseT ethernet adapters. * * Copyright (C) 1997, 1998, 1999, 2003, 2008 David S. Miller (davem@davemloft.net) diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index a7afcee..7a16d40 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* $Id: sungem.c,v 1.44.2.22 2002/03/13 01:18:12 davem Exp $ * sungem.c: Sun GEM ethernet driver. * diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index 0431f1e..06da2f5 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* sunhme.c: Sparc HME/BigMac 10/100baseT half/full duplex auto switching, * auto carrier detecting ethernet driver. Also known as the * "Happy Meal Ethernet" found on SunSwift SBUS cards. diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c index a6bcdcd..7fe0d5e 100644 --- a/drivers/net/ethernet/sun/sunqe.c +++ b/drivers/net/ethernet/sun/sunqe.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* sunqe.c: Sparc QuadEthernet 10baseT SBUS card driver. * Once again I am out to prove that every ethernet * controller out there can be most efficiently programmed diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index 27fb226..63d3d6b 100644 --- a/drivers/net/ethernet/sun/sunvnet.c +++ b/drivers/net/ethernet/sun/sunvnet.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* sunvnet.c: Sun LDOM Virtual Network Driver. * * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net> diff --git a/drivers/net/ethernet/sun/sunvnet_common.c b/drivers/net/ethernet/sun/sunvnet_common.c index 8aa3ce4..d8f4c3f 100644 --- a/drivers/net/ethernet/sun/sunvnet_common.c +++ b/drivers/net/ethernet/sun/sunvnet_common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* sunvnet.c: Sun LDOM Virtual Network Driver. * * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net>
Add the appropriate SPDX license tags to the Sun network drivers as outlined in Documentation/process/license-rules.rst. Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com> --- drivers/net/ethernet/sun/Kconfig | 1 + drivers/net/ethernet/sun/cassini.c | 1 + drivers/net/ethernet/sun/cassini.h | 1 + drivers/net/ethernet/sun/ldmvsw.c | 1 + drivers/net/ethernet/sun/niu.c | 1 + drivers/net/ethernet/sun/sunbmac.c | 1 + drivers/net/ethernet/sun/sungem.c | 1 + drivers/net/ethernet/sun/sunhme.c | 1 + drivers/net/ethernet/sun/sunqe.c | 1 + drivers/net/ethernet/sun/sunvnet.c | 1 + drivers/net/ethernet/sun/sunvnet_common.c | 1 + 11 files changed, 11 insertions(+)