[PATCH] staging: netlogic: Add SPDX-License-Identifier in platform_net.h

[PATCH] staging: netlogic: Add SPDX-License-Identifier in platform_net.h

[Bhagyashri Dighole]

Adds the SPDX GPL-2.0 or BSD-2-CLAUSE license identifier, which solves
the checkpatch.pl warning:
"WARNING: Missing or malformed SPDX-License-Identifier tag in line 1".
Adds GNU term: "Redistributions of source code must retain the above
copyright".

Signed-off-by: Bhagyashri Dighole <digholebhagyashri@gmail.com>
---
 drivers/staging/netlogic/platform_net.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/netlogic/platform_net.h b/drivers/staging/netlogic/platform_net.h
index e1b27f6..2265927 100644
--- a/drivers/staging/netlogic/platform_net.h
+++ b/drivers/staging/netlogic/platform_net.h
@@ -1,9 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-CLAUSE)
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
+ * 1. Redistributions of source code must retain the above copyright
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the Broadcom
  * license below:
-- 
2.7.4

Re: [Outreachy kernel] [PATCH] staging: netlogic: Add SPDX-License-Identifier in platform_net.h

[Julia Lawall]

On Sat, 23 Feb 2019, Bhagyashri Dighole wrote:

> Adds the SPDX GPL-2.0 or BSD-2-CLAUSE license identifier, which solves
> the checkpatch.pl warning:
> "WARNING: Missing or malformed SPDX-License-Identifier tag in line 1".
> Adds GNU term: "Redistributions of source code must retain the above
> copyright".
>
> Signed-off-by: Bhagyashri Dighole <digholebhagyashri@gmail.com>
> ---
>  drivers/staging/netlogic/platform_net.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/netlogic/platform_net.h b/drivers/staging/netlogic/platform_net.h
> index e1b27f6..2265927 100644
> --- a/drivers/staging/netlogic/platform_net.h
> +++ b/drivers/staging/netlogic/platform_net.h
> @@ -1,9 +1,10 @@
> -/*
> +/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-CLAUSE)
>   * Copyright (c) 2003-2012 Broadcom Corporation
>   * All Rights Reserved
>   *
>   * This software is available to you under a choice of one of two
>   * licenses.  You may choose to be licensed under the terms of the GNU
> + * 1. Redistributions of source code must retain the above copyright

It looks like something went wrong here.

Bhanusree submitted similar patch on another file and Greg said that the
file didn't have a SPDX identifier because it was not clear what the
license should be.  Perhaps it is more clear here,

julia

>   * General Public License (GPL) Version 2, available from the file
>   * COPYING in the main directory of this source tree, or the Broadcom
>   * license below:
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20190223070139.GA13015%40bhagyashri-Lenovo-G570.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [Outreachy kernel] [PATCH] staging: netlogic: Add SPDX-License-Identifier in platform_net.h

[Bhagyashri Dighole]

[-- Attachment #1: Type: text/plain, Size: 2738 bytes --]

In the license context, It is mentioned that "This software is available to
you under a choice of one of two licenses.". This way I found that the
software can be used with either GPL-2.0 license or BSD-2-Clause license.
These are the short identifiers for SPDX licenses. That's why we used
license expression syntax with 'OR' operator. Also, the following term was
missing under the GNU:
"1. Redistributions of source code must retain the above copyright"

So, I added above term under the GNU.

--
Bhagyashri Dighole

On Sat, Feb 23, 2019 at 12:47 PM Julia Lawall <julia.lawall@lip6.fr> wrote:

>
>
> On Sat, 23 Feb 2019, Bhagyashri Dighole wrote:
>
> > Adds the SPDX GPL-2.0 or BSD-2-CLAUSE license identifier, which solves
> > the checkpatch.pl warning:
> > "WARNING: Missing or malformed SPDX-License-Identifier tag in line 1".
> > Adds GNU term: "Redistributions of source code must retain the above
> > copyright".
> >
> > Signed-off-by: Bhagyashri Dighole <digholebhagyashri@gmail.com>
> > ---
> >  drivers/staging/netlogic/platform_net.h | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/staging/netlogic/platform_net.h
> b/drivers/staging/netlogic/platform_net.h
> > index e1b27f6..2265927 100644
> > --- a/drivers/staging/netlogic/platform_net.h
> > +++ b/drivers/staging/netlogic/platform_net.h
> > @@ -1,9 +1,10 @@
> > -/*
> > +/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-CLAUSE)
> >   * Copyright (c) 2003-2012 Broadcom Corporation
> >   * All Rights Reserved
> >   *
> >   * This software is available to you under a choice of one of two
> >   * licenses.  You may choose to be licensed under the terms of the GNU
> > + * 1. Redistributions of source code must retain the above copyright
>
> It looks like something went wrong here.
>
> Bhanusree submitted similar patch on another file and Greg said that the
> file didn't have a SPDX identifier because it was not clear what the
> license should be.  Perhaps it is more clear here,
>
> julia
>
> >   * General Public License (GPL) Version 2, available from the file
> >   * COPYING in the main directory of this source tree, or the Broadcom
> >   * license below:
> > --
> > 2.7.4
> >
> > --
> > You received this message because you are subscribed to the Google
> Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send
> an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit
> https://groups.google.com/d/msgid/outreachy-kernel/20190223070139.GA13015%40bhagyashri-Lenovo-G570
> .
> > For more options, visit https://groups.google.com/d/optout.
> >
>

[-- Attachment #2: Type: text/html, Size: 3969 bytes --]

Re: [Outreachy kernel] [PATCH] staging: netlogic: Add SPDX-License-Identifier in platform_net.h

[Julia Lawall]

[-- Attachment #1: Type: text/plain, Size: 3598 bytes --]

On Sat, 23 Feb 2019, Bhagyashri Dighole wrote:

> In the license context, It is mentioned that "This software is available to
> you under a choice of one of two licenses.". This way I found that the
> software can be used with either GPL-2.0 license or BSD-2-Clause license.

I saw the two licenses, but I didn't get how what they refer to as "the
Broadcom license" is related to BSD-2-clause.  But I don't know anything
about BSD-2-clause either.

> These are the short identifiers for SPDX licenses. That's why we used
> license expression syntax with 'OR' operator. Also, the following term was
> missing under the GNU:
> "1. Redistributions of source code must retain the above copyright"
>
> So, I added above term under the GNU.

I saw from your other patch that this line is there, but the text looks
massively garbled.  The line before flows into the line after, but I can't
see how this 1. ... line fits in.

julia

> --
> Bhagyashri Dighole
>
> On Sat, Feb 23, 2019 at 12:47 PM Julia Lawall <julia.lawall@lip6.fr> wrote:
>
>
>       On Sat, 23 Feb 2019, Bhagyashri Dighole wrote:
>
>       > Adds the SPDX GPL-2.0 or BSD-2-CLAUSE license identifier,
>       which solves
>       > the checkpatch.pl warning:
>       > "WARNING: Missing or malformed SPDX-License-Identifier tag in
>       line 1".
>       > Adds GNU term: "Redistributions of source code must retain the
>       above
>       > copyright".
>       >
>       > Signed-off-by: Bhagyashri Dighole
>       <digholebhagyashri@gmail.com>
>       > ---
>       >ￜ drivers/staging/netlogic/platform_net.h | 3 ++-
>       >ￜ 1 file changed, 2 insertions(+), 1 deletion(-)
>       >
>       > diff --git a/drivers/staging/netlogic/platform_net.h
>       b/drivers/staging/netlogic/platform_net.h
>       > index e1b27f6..2265927 100644
>       > --- a/drivers/staging/netlogic/platform_net.h
>       > +++ b/drivers/staging/netlogic/platform_net.h
>       > @@ -1,9 +1,10 @@
>       > -/*
>       > +/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-CLAUSE)
>       >ￜ ￜ* Copyright (c) 2003-2012 Broadcom Corporation
>       >ￜ ￜ* All Rights Reserved
>       >ￜ ￜ*
>       >ￜ ￜ* This software is available to you under a choice of one of
>       two
>       >ￜ ￜ* licenses.ￜ You may choose to be licensed under the terms
>       of the GNU
>       > + * 1. Redistributions of source code must retain the above
>       copyright
>
>       It looks like something went wrong here.
>
>       Bhanusree submitted similar patch on another file and Greg said
>       that the
>       file didn't have a SPDX identifier because it was not clear what
>       the
>       license should be.ￜ Perhaps it is more clear here,
>
>       julia
>
>       >ￜ ￜ* General Public License (GPL) Version 2, available from the
>       file
>       >ￜ ￜ* COPYING in the main directory of this source tree, or the
>       Broadcom
>       >ￜ ￜ* license below:
>       > --
>       > 2.7.4
>       >
>       > --
>       > You received this message because you are subscribed to the
>       Google Groups "outreachy-kernel" group.
>       > To unsubscribe from this group and stop receiving emails from
>       it, send an email to
>       outreachy-kernel+unsubscribe@googlegroups.com.
>       > To post to this group, send email to
>       outreachy-kernel@googlegroups.com.
>       > To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/20190223070139.GA13015%4
>       0bhagyashri-Lenovo-G570.
>       > For more options, visit https://groups.google.com/d/optout.
>       >
>
>
>