Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-25 Thread Bradley M. Kuhn
> On Fri, Jan 21, 2022 at 03:13:50PM +, Christophe Leroy wrote:
> > Isn't it what GPL-2.0+ means ?

Greg Kroah-Hartman wrote:
> Yes, but look further down, as I point out below...
>
> > >>  include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD 
> > >> */
> > >>  include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */
> > >>  include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD 
> > >> */
> > >>  include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */
> > >>  kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0
> > >>  lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */
> > >>  mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0
> > >>  mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0
> > >>  mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1
> > >>  platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR 
> > >> OpenIB BSD
> > >>  tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+
> > >>  xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */

If you're combining GPLv2-or-later works with LGPLv2.0/2.1 works, you'll have
to normalize to some GPLv2-based license (such as GPLv2-or-later), since
LGPLv2.1 requires that for combinations.  You won't be able to carry along
the "OR 3-Clause-BSD" part once the combination is made.  Similarly true with
GPLv2-or-later, but LGPL is the interesting one because it's explicit about
the need to change license notices to GPL notices when you combine.

 -- bkuhn


Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread J Lovejoy
(trying this again, as first time, my message bounced)

I just saw this and have not followed the entire thread from the beginning, but 
if you are unsure if a given license text to something on the SPDX License 
List, I highly recommend using the SPDX License-diff browser extension / add-on 
(for Chrome or Firefox) - once you have that, you can simply highlight a text 
in your browser window and it will tell you if it matches or how far off it is 
if not.

If a license is NOT a match to anything on the SPDX License List, please submit 
it to the SPDX legal team here: https://tools.spdx.org/app/submit_new_license/ 
(and preferably then tag me in the Github issue, my Github ide is @jlovejoy ) 
Please make sure to include that it's in the LInux kernel and a link to where 
you found it. 

More about requesting a new license be added to the SPDX License List can be 
found here: 
https://github.com/spdx/license-list-XML/blob/master/DOCS/request-new-license.md

Thanks!
Jilayne
SPDX legal team co-lead

> On Jan 21, 2022, at 10:17 AM, Richard Fontana  wrote:
> 
> On Fri, Jan 21, 2022 at 6:03 AM Christophe Leroy
>  wrote:
>> 
>> Several files are missing SPDX license identifiers.
>> 
>> Following files are given the following SPDX identifier based on the 
>> comments in the top of the file:
>> 
>>include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB 
>> BSD */
> [...]
>>platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR 
>> OpenIB BSD
> 
> "OpenIB BSD" is not a defined SPDX identifier. There is an SPDX
> identifier "Linux-OpenIB"
> https://spdx.org/licenses/Linux-OpenIB.html
> but I believe that is not a match to what's in these files
> (specifically, the wording of the disclaimer), rather I believe what
> you want here is BSD-2-Clause, but you may want to check that.
> 
> Richard
> 



Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread J Lovejoy
I just saw this and have not followed the entire thread from the 
beginning, but if you are unsure if a given license text to something on 
the SPDX License List, I highly recommend using the SPDX License-diff 
browser extension / add-on (for Chrome or Firefox) - once you have that, 
you can simply highlight a text in your browser window and it will tell 
you if it matches or how far off it is if not.


If a license is NOT a match to anything on the SPDX License List, please 
submit it to the SPDX legal team here: 
https://tools.spdx.org/app/submit_new_license/ (and preferably then tag 
me in the Github issue, my Github ide is @jlovejoy ) Please make sure to 
include that it's in the LInux kernel and a link to where you found it.


More about requesting a new license be added to the SPDX License List 
can be found here: 
https://github.com/spdx/license-list-XML/blob/master/DOCS/request-new-license.md


Thanks!
Jilayne
SPDX legal team co-lead


On 1/21/22 10:17 AM, Richard Fontana wrote:

On Fri, Jan 21, 2022 at 6:03 AM Christophe Leroy
  wrote:

Several files are missing SPDX license identifiers.

Following files are given the following SPDX identifier based on the comments 
in the top of the file:

 include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB 
BSD */

  [...]

 platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR 
OpenIB BSD

"OpenIB BSD" is not a defined SPDX identifier. There is an SPDX
identifier "Linux-OpenIB"
https://spdx.org/licenses/Linux-OpenIB.html
but I believe that is not a match to what's in these files
(specifically, the wording of the disclaimer), rather I believe what
you want here is BSD-2-Clause, but you may want to check that.

Richard



Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread Richard Fontana
On Fri, Jan 21, 2022 at 6:03 AM Christophe Leroy
 wrote:
>
> Several files are missing SPDX license identifiers.
>
> Following files are given the following SPDX identifier based on the comments 
> in the top of the file:
>
> include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB 
> BSD */
 [...]
> platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR 
> OpenIB BSD

"OpenIB BSD" is not a defined SPDX identifier. There is an SPDX
identifier "Linux-OpenIB"
https://spdx.org/licenses/Linux-OpenIB.html
but I believe that is not a match to what's in these files
(specifically, the wording of the disclaimer), rather I believe what
you want here is BSD-2-Clause, but you may want to check that.

Richard



Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread Richard Fontana
On Fri, Jan 21, 2022 at 6:03 AM Christophe Leroy
 wrote:
>
> Several files are missing SPDX license identifiers.
>
> Following files are given the following SPDX identifier based on the comments 
> in the top of the file:
>
> include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR 
> BSD */
> include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD 
> */

"BSD" is not a defined SPDX identifier. I believe what you want here
is "BSD-3-Clause" (see: https://spdx.org/licenses/BSD-3-Clause.html)

Richard



Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread Segher Boessenkool
On Fri, Jan 21, 2022 at 04:19:12PM +0100, Greg Kroah-Hartman wrote:
> On Fri, Jan 21, 2022 at 03:13:50PM +, Christophe Leroy wrote:
> > >> - * This file is free software; you can redistribute it and/or modify it
> > >> - * under the terms of the GNU General Public License as published by the
> > >> - * Free Software Foundation; either version 2, or (at your option) any
> > >> - * later version.

[ ... ]

> > >>*As a special exception, if you link this library with files
> > >>*compiled with GCC to produce an executable, this does not cause
> > >>*the resulting executable to be covered by the GNU General Public 
> > >> License.

The "as a special exception" refers to "This file is free software;
you can redistribute it and/or modify it".  It is meaningless without
having anything it is an exception *to* :-)

In general, you should never edit licence texts.

> > > Look at that "special exception", why are you ignoring it here?  You
> > > can't do that :(
> > 
> > I'm not ignoring it, that's the reason why I left it.
> 
> You ignore that part of the license in the SPDX line, why?
> 
> > Isn't it the correct way to do ? How should it be done ?
> 
> You need to properly describe this in the SPDX line.  You did not do so
> here, which means that any tool just looking at the SPDX line would get
> this license wrong.

A new label needs to be defined and documented.  Should be pretty
mechanical to do, but that should see a wider audience than the powerpc
hackers :-)


Segher


Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread Greg Kroah-Hartman
On Fri, Jan 21, 2022 at 03:34:24PM +, Christophe Leroy wrote:
> 
> 
> Le 21/01/2022 à 16:19, Greg Kroah-Hartman a écrit :
> > On Fri, Jan 21, 2022 at 03:13:50PM +, Christophe Leroy wrote:
> >>
> >>
> >> Le 21/01/2022 à 15:35, Greg Kroah-Hartman a écrit :
> 
> ...
> 
>  @@ -20,16 +16,6 @@
>  * respects; for example, they cover modification of the file, and
>  * distribution when not linked into another program.)
>  *
>  - * This file is distributed in the hope that it will be useful, but
>  - * WITHOUT ANY WARRANTY; without even the implied warranty of
>  - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>  - * General Public License for more details.
>  - *
>  - * You should have received a copy of the GNU General Public License
>  - * along with this program; see the file COPYING.  If not, write to
>  - * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
>  - * Boston, MA 02110-1301, USA.
>  - *
>  *As a special exception, if you link this library with files
>  *compiled with GCC to produce an executable, this does not cause
>  *the resulting executable to be covered by the GNU General 
>  Public License.
> >>>
> >>> Look at that "special exception", why are you ignoring it here?  You
> >>> can't do that :(
> >>
> >> I'm not ignoring it, that's the reason why I left it.
> > 
> > You ignore that part of the license in the SPDX line, why?
> > 
> >> Isn't it the correct way to do ? How should it be done ?
> > 
> > You need to properly describe this in the SPDX line.  You did not do so
> > here, which means that any tool just looking at the SPDX line would get
> > this license wrong.
> 
> How do you describe such an exception on the SPDX line then ?
> 
> You add " WITH GCC-exception-2.0" to the SPDX line ? Am I understanding 
> correctly ?

I do not know, please ask the SPDX people.

There's a reason we didn't catch these files in our original sweep, and
that is because they take some manual work.  Which is great to see you
doing, but realize it isn't as simple as your first set of patches were
:)

thanks,

greg k-h


Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread Christophe Leroy


Le 21/01/2022 à 16:19, Greg Kroah-Hartman a écrit :
> On Fri, Jan 21, 2022 at 03:13:50PM +, Christophe Leroy wrote:
>>
>>
>> Le 21/01/2022 à 15:35, Greg Kroah-Hartman a écrit :

...

 @@ -20,16 +16,6 @@
 * respects; for example, they cover modification of the file, and
 * distribution when not linked into another program.)
 *
 - * This file is distributed in the hope that it will be useful, but
 - * WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 - * General Public License for more details.
 - *
 - * You should have received a copy of the GNU General Public License
 - * along with this program; see the file COPYING.  If not, write to
 - * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 - * Boston, MA 02110-1301, USA.
 - *
 *As a special exception, if you link this library with files
 *compiled with GCC to produce an executable, this does not cause
 *the resulting executable to be covered by the GNU General Public 
 License.
>>>
>>> Look at that "special exception", why are you ignoring it here?  You
>>> can't do that :(
>>
>> I'm not ignoring it, that's the reason why I left it.
> 
> You ignore that part of the license in the SPDX line, why?
> 
>> Isn't it the correct way to do ? How should it be done ?
> 
> You need to properly describe this in the SPDX line.  You did not do so
> here, which means that any tool just looking at the SPDX line would get
> this license wrong.

How do you describe such an exception on the SPDX line then ?

You add " WITH GCC-exception-2.0" to the SPDX line ? Am I understanding 
correctly ?


Thanks
Christophe

Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread Greg Kroah-Hartman
On Fri, Jan 21, 2022 at 03:13:50PM +, Christophe Leroy wrote:
> 
> 
> Le 21/01/2022 à 15:35, Greg Kroah-Hartman a écrit :
> > On Fri, Jan 21, 2022 at 11:03:20AM +, Christophe Leroy wrote:
> >> Several files are missing SPDX license identifiers.
> >>
> >> Following files are given the following SPDX identifier based on the 
> >> comments in the top of the file:
> >>
> >>boot/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */
> > 
> > Are you sure that this is the correct license for this file?
> 
> it says "... GNU General Public License ... either version 2, or (at 
> your option) any later version".
> 
> Isn't it what GPL-2.0+ means ?

Yes, but look further down, as I point out below...

> >>include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD 
> >> */
> >>include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */
> >>include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD 
> >> */
> >>include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */
> >>kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0
> >>lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */
> >>mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0
> >>mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0
> >>mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1
> >>platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR 
> >> OpenIB BSD
> >>tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+
> >>xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */
> >>
> >> Add to other files the default kernel license identifier, in extenso 
> >> GPL-2.0.
> >>
> >> DTS files are handled in a separate commit.
> >>
> >> Signed-off-by: Christophe Leroy 
> >> Cc: Thomas Gleixner 
> >> Cc: Greg Kroah-Hartman 
> >> Cc: linux-s...@vger.kernel.org
> >> ---
> >> v3: Removed license text and license note in the files that have any.
> >>
> >> v2: Changed from GPL-2.0 to a licence consistant with the file's comments 
> >> for the few files listed in the commit message.
> >> ---
> 
> ...
> 
> >>   92 files changed, 105 insertions(+), 422 deletions(-)
> > 
> > You might want to change less of these at once, as this is hard to
> > review as-is.
> 
> Ok
> 
> > 
> >> diff --git a/arch/powerpc/boot/crtsavres.S b/arch/powerpc/boot/crtsavres.S
> >> index 085fb2b9a8b8..25e924459dcc 100644
> >> --- a/arch/powerpc/boot/crtsavres.S
> >> +++ b/arch/powerpc/boot/crtsavres.S
> >> @@ -1,3 +1,4 @@
> >> +/* SPDX-License-Identifier: GPL-2.0+ */
> >>   /*
> >>* Special support for eabi and SVR4
> >>*
> >> @@ -7,11 +8,6 @@
> >>*
> >>* Based on gcc/config/rs6000/crtsavres.asm from gcc
> >>*
> >> - * This file is free software; you can redistribute it and/or modify it
> >> - * under the terms of the GNU General Public License as published by the
> >> - * Free Software Foundation; either version 2, or (at your option) any
> >> - * later version.
> >> - *
> >>* In addition to the permissions in the GNU General Public License, the
> >>* Free Software Foundation gives you unlimited permission to link the
> >>* compiled version of this file with other programs, and to distribute
> >> @@ -20,16 +16,6 @@
> >>* respects; for example, they cover modification of the file, and
> >>* distribution when not linked into another program.)
> >>*
> >> - * This file is distributed in the hope that it will be useful, but
> >> - * WITHOUT ANY WARRANTY; without even the implied warranty of
> >> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> >> - * General Public License for more details.
> >> - *
> >> - * You should have received a copy of the GNU General Public License
> >> - * along with this program; see the file COPYING.  If not, write to
> >> - * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
> >> - * Boston, MA 02110-1301, USA.
> >> - *
> >>*As a special exception, if you link this library with files
> >>*compiled with GCC to produce an executable, this does not cause
> >>*the resulting executable to be covered by the GNU General Public 
> >> License.
> > 
> > Look at that "special exception", why are you ignoring it here?  You
> > can't do that :(
> 
> I'm not ignoring it, that's the reason why I left it.

You ignore that part of the license in the SPDX line, why?

> Isn't it the correct way to do ? How should it be done ?

You need to properly describe this in the SPDX line.  You did not do so
here, which means that any tool just looking at the SPDX line would get
this license wrong.

thanks,

greg k-h


Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread Christophe Leroy


Le 21/01/2022 à 15:35, Greg Kroah-Hartman a écrit :
> On Fri, Jan 21, 2022 at 11:03:20AM +, Christophe Leroy wrote:
>> Several files are missing SPDX license identifiers.
>>
>> Following files are given the following SPDX identifier based on the 
>> comments in the top of the file:
>>
>>  boot/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */
> 
> Are you sure that this is the correct license for this file?

it says "... GNU General Public License ... either version 2, or (at 
your option) any later version".

Isn't it what GPL-2.0+ means ?

> 
> Also you dropped the arch/powerpc/ prefix here...

Yes I did, for clarity, to get shorter lines.

> 
> 
>>  include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD 
>> */
>>  include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */
>>  include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD 
>> */
>>  include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */
>>  kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0
>>  lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */
>>  mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0
>>  mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0
>>  mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1
>>  platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR 
>> OpenIB BSD
>>  tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+
>>  xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */
>>
>> Add to other files the default kernel license identifier, in extenso GPL-2.0.
>>
>> DTS files are handled in a separate commit.
>>
>> Signed-off-by: Christophe Leroy 
>> Cc: Thomas Gleixner 
>> Cc: Greg Kroah-Hartman 
>> Cc: linux-s...@vger.kernel.org
>> ---
>> v3: Removed license text and license note in the files that have any.
>>
>> v2: Changed from GPL-2.0 to a licence consistant with the file's comments 
>> for the few files listed in the commit message.
>> ---

...

>>   92 files changed, 105 insertions(+), 422 deletions(-)
> 
> You might want to change less of these at once, as this is hard to
> review as-is.

Ok

> 
>> diff --git a/arch/powerpc/boot/crtsavres.S b/arch/powerpc/boot/crtsavres.S
>> index 085fb2b9a8b8..25e924459dcc 100644
>> --- a/arch/powerpc/boot/crtsavres.S
>> +++ b/arch/powerpc/boot/crtsavres.S
>> @@ -1,3 +1,4 @@
>> +/* SPDX-License-Identifier: GPL-2.0+ */
>>   /*
>>* Special support for eabi and SVR4
>>*
>> @@ -7,11 +8,6 @@
>>*
>>* Based on gcc/config/rs6000/crtsavres.asm from gcc
>>*
>> - * This file is free software; you can redistribute it and/or modify it
>> - * under the terms of the GNU General Public License as published by the
>> - * Free Software Foundation; either version 2, or (at your option) any
>> - * later version.
>> - *
>>* In addition to the permissions in the GNU General Public License, the
>>* Free Software Foundation gives you unlimited permission to link the
>>* compiled version of this file with other programs, and to distribute
>> @@ -20,16 +16,6 @@
>>* respects; for example, they cover modification of the file, and
>>* distribution when not linked into another program.)
>>*
>> - * This file is distributed in the hope that it will be useful, but
>> - * WITHOUT ANY WARRANTY; without even the implied warranty of
>> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> - * General Public License for more details.
>> - *
>> - * You should have received a copy of the GNU General Public License
>> - * along with this program; see the file COPYING.  If not, write to
>> - * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
>> - * Boston, MA 02110-1301, USA.
>> - *
>>*As a special exception, if you link this library with files
>>*compiled with GCC to produce an executable, this does not cause
>>*the resulting executable to be covered by the GNU General Public 
>> License.
> 
> Look at that "special exception", why are you ignoring it here?  You
> can't do that :(

I'm not ignoring it, that's the reason why I left it.

Isn't it the correct way to do ? How should it be done ?


Christophe

Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread Greg Kroah-Hartman
On Fri, Jan 21, 2022 at 11:03:20AM +, Christophe Leroy wrote:
> Several files are missing SPDX license identifiers.
> 
> Following files are given the following SPDX identifier based on the comments 
> in the top of the file:

Nit, please wrap your changelog text properly.

> 
>   boot/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */
>   include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD 
> */
>   include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */
>   include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD 
> */
>   include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */
>   kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0
>   lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */
>   mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0
>   mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0
>   mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1
>   platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR 
> OpenIB BSD
>   tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+
>   xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */
> 
> Add to other files the default kernel license identifier, in extenso GPL-2.0.

That might be good for a single commit alone, don't mix it up with the
other files that you are removing stuff from.

thanks,

greg k-h


Re: [PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread Greg Kroah-Hartman
On Fri, Jan 21, 2022 at 11:03:20AM +, Christophe Leroy wrote:
> Several files are missing SPDX license identifiers.
> 
> Following files are given the following SPDX identifier based on the comments 
> in the top of the file:
> 
>   boot/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */

Are you sure that this is the correct license for this file?

Also you dropped the arch/powerpc/ prefix here...


>   include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD 
> */
>   include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */
>   include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD 
> */
>   include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */
>   kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0
>   lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */
>   mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0
>   mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0
>   mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1
>   platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR 
> OpenIB BSD
>   tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+
>   xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */
> 
> Add to other files the default kernel license identifier, in extenso GPL-2.0.
> 
> DTS files are handled in a separate commit.
> 
> Signed-off-by: Christophe Leroy 
> Cc: Thomas Gleixner 
> Cc: Greg Kroah-Hartman 
> Cc: linux-s...@vger.kernel.org
> ---
> v3: Removed license text and license note in the files that have any.
> 
> v2: Changed from GPL-2.0 to a licence consistant with the file's comments for 
> the few files listed in the commit message.
> ---
>  arch/powerpc/Makefile |  5 +--
>  arch/powerpc/boot/44x.h   |  5 +--
>  arch/powerpc/boot/4xx.h   |  5 +--
>  arch/powerpc/boot/crtsavres.S | 16 +-
>  arch/powerpc/boot/dummy.c |  1 +
>  arch/powerpc/boot/install.sh  |  5 +--
>  arch/powerpc/boot/ops.h   |  6 ++--
>  arch/powerpc/boot/serial.c|  6 ++--
>  arch/powerpc/boot/simple_alloc.c  |  6 ++--
>  arch/powerpc/include/asm/8xx_immap.h  |  1 +
>  arch/powerpc/include/asm/asm-compat.h |  1 +
>  arch/powerpc/include/asm/asm-const.h  |  1 +
>  arch/powerpc/include/asm/asm-offsets.h|  1 +
>  arch/powerpc/include/asm/cpm.h|  1 +
>  arch/powerpc/include/asm/dtl.h|  1 +
>  arch/powerpc/include/asm/edac.h   |  6 ++--
>  arch/powerpc/include/asm/ehv_pic.h|  5 +--
>  arch/powerpc/include/asm/emergency-restart.h  |  1 +
>  arch/powerpc/include/asm/epapr_hcalls.h   | 32 +--
>  arch/powerpc/include/asm/fixmap.h |  5 +--
>  arch/powerpc/include/asm/floppy.h |  5 +--
>  arch/powerpc/include/asm/fs_pd.h  |  5 +--
>  arch/powerpc/include/asm/fsl_hcalls.h | 32 +--
>  arch/powerpc/include/asm/hydra.h  |  5 +--
>  arch/powerpc/include/asm/ibmebus.h| 29 +
>  arch/powerpc/include/asm/kgdb.h   |  6 ++--
>  arch/powerpc/include/asm/membarrier.h |  1 +
>  arch/powerpc/include/asm/module.lds.h |  1 +
>  arch/powerpc/include/asm/mpc52xx.h|  5 +--
>  arch/powerpc/include/asm/mpc52xx_psc.h|  5 +--
>  arch/powerpc/include/asm/pmac_feature.h   |  5 +--
>  arch/powerpc/include/asm/ppc_asm.h|  1 +
>  arch/powerpc/include/asm/pte-walk.h   |  1 +
>  arch/powerpc/include/asm/rheap.h  |  6 ++--
>  arch/powerpc/include/asm/sfp-machine.h| 16 +-
>  arch/powerpc/include/asm/vmalloc.h|  1 +
>  arch/powerpc/include/asm/word-at-a-time.h |  1 +
>  arch/powerpc/kernel/interrupt_64.S|  1 +
>  arch/powerpc/kernel/kgdb.c|  5 +--
>  arch/powerpc/kernel/ptrace/ptrace.c   |  5 +--
>  arch/powerpc/kernel/ptrace/ptrace32.c |  5 +--
>  arch/powerpc/kernel/signal.c  |  5 +--
>  arch/powerpc/kernel/signal.h  |  5 +--
>  arch/powerpc/kernel/vdso32/note.S |  1 +
>  arch/powerpc/kernel/vdso64/note.S |  1 +
>  arch/powerpc/kvm/mpic.c   | 19 +--
>  arch/powerpc/lib/crtsavres.S  | 16 +-
>  arch/powerpc/lib/restart_table.c  |  1 +
>  arch/powerpc/lib/rheap.c  |  6 ++--
>  arch/powerpc/mm/book3s64/hash_4k.c| 10 +-
>  arch/powerpc/mm/book3s64/hash_64k.c   | 10 +-
>  arch/powerpc/mm/book3s64/hash_hugepage.c  | 10 +-
>  arch/powerpc/mm/hugetlbpage.c |  1 +
>  arch/powerpc/perf/req-gen/_end.h  |  1 +
>  arch/powerpc/platforms/44x/fsp2.h |  1 +
>  arch/powerpc/

[PATCH v3] powerpc: Add missing SPDX license identifiers

2022-01-21 Thread Christophe Leroy
Several files are missing SPDX license identifiers.

Following files are given the following SPDX identifier based on the comments 
in the top of the file:

boot/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */
include/asm/epapr_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD 
*/
include/asm/fsl_hcalls.h:/* SPDX-License-Identifier: GPL-2.0+ OR BSD */
include/asm/ibmebus.h:/* SPDX-License-Identifier: GPL-2.0 OR OpenIB BSD 
*/
include/asm/sfp-machine.h:/* SPDX-License-Identifier: LGPL-2.0+ */
kvm/mpic.c:// SPDX-License-Identifier: GPL-2.0
lib/crtsavres.S:/* SPDX-License-Identifier: GPL-2.0+ */
mm/book3s64/hash_4k.c:// SPDX-License-Identifier: LGPL-2.0
mm/book3s64/hash_64k.c:// SPDX-License-Identifier: LGPL-2.0
mm/book3s64/hash_hugepage.c:// SPDX-License-Identifier: LGPL-2.1
platforms/pseries/ibmebus.c:// SPDX-License-Identifier: GPL-2.0 OR 
OpenIB BSD
tools/head_check.sh:# SPDX-License-Identifier: GPL-2.0+
xmon/ppc.h:/* SPDX-License-Identifier: GPL-1.0+ */

Add to other files the default kernel license identifier, in extenso GPL-2.0.

DTS files are handled in a separate commit.

Signed-off-by: Christophe Leroy 
Cc: Thomas Gleixner 
Cc: Greg Kroah-Hartman 
Cc: linux-s...@vger.kernel.org
---
v3: Removed license text and license note in the files that have any.

v2: Changed from GPL-2.0 to a licence consistant with the file's comments for 
the few files listed in the commit message.
---
 arch/powerpc/Makefile |  5 +--
 arch/powerpc/boot/44x.h   |  5 +--
 arch/powerpc/boot/4xx.h   |  5 +--
 arch/powerpc/boot/crtsavres.S | 16 +-
 arch/powerpc/boot/dummy.c |  1 +
 arch/powerpc/boot/install.sh  |  5 +--
 arch/powerpc/boot/ops.h   |  6 ++--
 arch/powerpc/boot/serial.c|  6 ++--
 arch/powerpc/boot/simple_alloc.c  |  6 ++--
 arch/powerpc/include/asm/8xx_immap.h  |  1 +
 arch/powerpc/include/asm/asm-compat.h |  1 +
 arch/powerpc/include/asm/asm-const.h  |  1 +
 arch/powerpc/include/asm/asm-offsets.h|  1 +
 arch/powerpc/include/asm/cpm.h|  1 +
 arch/powerpc/include/asm/dtl.h|  1 +
 arch/powerpc/include/asm/edac.h   |  6 ++--
 arch/powerpc/include/asm/ehv_pic.h|  5 +--
 arch/powerpc/include/asm/emergency-restart.h  |  1 +
 arch/powerpc/include/asm/epapr_hcalls.h   | 32 +--
 arch/powerpc/include/asm/fixmap.h |  5 +--
 arch/powerpc/include/asm/floppy.h |  5 +--
 arch/powerpc/include/asm/fs_pd.h  |  5 +--
 arch/powerpc/include/asm/fsl_hcalls.h | 32 +--
 arch/powerpc/include/asm/hydra.h  |  5 +--
 arch/powerpc/include/asm/ibmebus.h| 29 +
 arch/powerpc/include/asm/kgdb.h   |  6 ++--
 arch/powerpc/include/asm/membarrier.h |  1 +
 arch/powerpc/include/asm/module.lds.h |  1 +
 arch/powerpc/include/asm/mpc52xx.h|  5 +--
 arch/powerpc/include/asm/mpc52xx_psc.h|  5 +--
 arch/powerpc/include/asm/pmac_feature.h   |  5 +--
 arch/powerpc/include/asm/ppc_asm.h|  1 +
 arch/powerpc/include/asm/pte-walk.h   |  1 +
 arch/powerpc/include/asm/rheap.h  |  6 ++--
 arch/powerpc/include/asm/sfp-machine.h| 16 +-
 arch/powerpc/include/asm/vmalloc.h|  1 +
 arch/powerpc/include/asm/word-at-a-time.h |  1 +
 arch/powerpc/kernel/interrupt_64.S|  1 +
 arch/powerpc/kernel/kgdb.c|  5 +--
 arch/powerpc/kernel/ptrace/ptrace.c   |  5 +--
 arch/powerpc/kernel/ptrace/ptrace32.c |  5 +--
 arch/powerpc/kernel/signal.c  |  5 +--
 arch/powerpc/kernel/signal.h  |  5 +--
 arch/powerpc/kernel/vdso32/note.S |  1 +
 arch/powerpc/kernel/vdso64/note.S |  1 +
 arch/powerpc/kvm/mpic.c   | 19 +--
 arch/powerpc/lib/crtsavres.S  | 16 +-
 arch/powerpc/lib/restart_table.c  |  1 +
 arch/powerpc/lib/rheap.c  |  6 ++--
 arch/powerpc/mm/book3s64/hash_4k.c| 10 +-
 arch/powerpc/mm/book3s64/hash_64k.c   | 10 +-
 arch/powerpc/mm/book3s64/hash_hugepage.c  | 10 +-
 arch/powerpc/mm/hugetlbpage.c |  1 +
 arch/powerpc/perf/req-gen/_end.h  |  1 +
 arch/powerpc/platforms/44x/fsp2.h |  1 +
 arch/powerpc/platforms/4xx/pci.c  |  1 +
 arch/powerpc/platforms/4xx/pci.h  |  1 +
 arch/powerpc/platforms/52xx/efika.c   |  5 +--
 arch/powerpc/platforms/52xx/mpc52xx_common.c  |  6 +---
 arch/powerpc/platforms/52xx/mpc52xx_pci.c |  5 +--
 arch/powerpc/platforms/52xx/mpc52xx_pic.c |  6 +---
 arch/powerpc/platf