[PATCH resend 09/13] sh: sh5: convert to SPDX identifiers

[PATCH resend 09/13] sh: sh5: convert to SPDX identifiers

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch updates license to use SPDX-License-Identifier
instead of verbose license text.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/sh/kernel/cpu/sh5/clock-sh5.c | 5 +----
 arch/sh/kernel/cpu/sh5/entry.S     | 7 ++-----
 arch/sh/kernel/cpu/sh5/fpu.c       | 5 +----
 arch/sh/kernel/cpu/sh5/probe.c     | 5 +----
 arch/sh/kernel/cpu/sh5/setup-sh5.c | 5 +----
 arch/sh/kernel/cpu/sh5/switchto.S  | 7 ++-----
 arch/sh/kernel/cpu/sh5/unwind.c    | 5 +----
 7 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/arch/sh/kernel/cpu/sh5/clock-sh5.c b/arch/sh/kernel/cpu/sh5/clock-sh5.c
index c48b93d..43763c2 100644
--- a/arch/sh/kernel/cpu/sh5/clock-sh5.c
+++ b/arch/sh/kernel/cpu/sh5/clock-sh5.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/kernel/cpu/sh5/clock-sh5.c
  *
  * SH-5 support for the clock framework
  *
  *  Copyright (C) 2008  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S
index 0c8d037..de68ffd 100644
--- a/arch/sh/kernel/cpu/sh5/entry.S
+++ b/arch/sh/kernel/cpu/sh5/entry.S
@@ -1,13 +1,10 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0
+ *
  * arch/sh/kernel/cpu/sh5/entry.S
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2004 - 2008  Paul Mundt
  * Copyright (C) 2003, 2004  Richard Curnow
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
  */
 #include <linux/errno.h>
 #include <linux/init.h>
diff --git a/arch/sh/kernel/cpu/sh5/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c
index 9f8713a..9218d9e 100644
--- a/arch/sh/kernel/cpu/sh5/fpu.c
+++ b/arch/sh/kernel/cpu/sh5/fpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/kernel/cpu/sh5/fpu.c
  *
@@ -7,10 +8,6 @@
  *
  * Started from SH4 version:
  *   Copyright (C) 1999, 2000  Kaz Kojima & Niibe Yutaka
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
  */
 #include <linux/sched.h>
 #include <linux/signal.h>
diff --git a/arch/sh/kernel/cpu/sh5/probe.c b/arch/sh/kernel/cpu/sh5/probe.c
index eca427c..9472501 100644
--- a/arch/sh/kernel/cpu/sh5/probe.c
+++ b/arch/sh/kernel/cpu/sh5/probe.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/kernel/cpu/sh5/probe.c
  *
@@ -5,10 +6,6 @@
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  * Copyright (C) 2003 - 2007  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
  */
 #include <linux/init.h>
 #include <linux/io.h>
diff --git a/arch/sh/kernel/cpu/sh5/setup-sh5.c b/arch/sh/kernel/cpu/sh5/setup-sh5.c
index 084a9cc..41c1673 100644
--- a/arch/sh/kernel/cpu/sh5/setup-sh5.c
+++ b/arch/sh/kernel/cpu/sh5/setup-sh5.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SH5-101/SH5-103 CPU Setup
  *
  *  Copyright (C) 2009  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
  */
 #include <linux/platform_device.h>
 #include <linux/init.h>
diff --git a/arch/sh/kernel/cpu/sh5/switchto.S b/arch/sh/kernel/cpu/sh5/switchto.S
index 45c351b0..d1beff7 100644
--- a/arch/sh/kernel/cpu/sh5/switchto.S
+++ b/arch/sh/kernel/cpu/sh5/switchto.S
@@ -1,13 +1,10 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0
+ *
  * arch/sh/kernel/cpu/sh5/switchto.S
  *
  * sh64 context switch
  *
  * Copyright (C) 2004  Richard Curnow
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
 */
 
 	.section .text..SHmedia32,"ax"
diff --git a/arch/sh/kernel/cpu/sh5/unwind.c b/arch/sh/kernel/cpu/sh5/unwind.c
index 3a4fed4..3cb0cd9 100644
--- a/arch/sh/kernel/cpu/sh5/unwind.c
+++ b/arch/sh/kernel/cpu/sh5/unwind.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/kernel/cpu/sh5/unwind.c
  *
  * Copyright (C) 2004  Paul Mundt
  * Copyright (C) 2004  Richard Curnow
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
  */
 #include <linux/kallsyms.h>
 #include <linux/kernel.h>
-- 
2.7.4

Re: [PATCH resend 09/13] sh: sh5: convert to SPDX identifiers

[Rob Landley]

On 11/8/18 12:28 AM, Kuninori Morimoto wrote:> 
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> This patch updates license to use SPDX-License-Identifier
> instead of verbose license text.
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> ---
>  arch/sh/kernel/cpu/sh5/clock-sh5.c | 5 +----
>  arch/sh/kernel/cpu/sh5/entry.S     | 7 ++-----
>  arch/sh/kernel/cpu/sh5/fpu.c       | 5 +----
>  arch/sh/kernel/cpu/sh5/probe.c     | 5 +----
>  arch/sh/kernel/cpu/sh5/setup-sh5.c | 5 +----
>  arch/sh/kernel/cpu/sh5/switchto.S  | 7 ++-----
>  arch/sh/kernel/cpu/sh5/unwind.c    | 5 +----
>  7 files changed, 9 insertions(+), 30 deletions(-)
> 
> diff --git a/arch/sh/kernel/cpu/sh5/clock-sh5.c b/arch/sh/kernel/cpu/sh5/clock-sh5.c
> index c48b93d..43763c2 100644
> --- a/arch/sh/kernel/cpu/sh5/clock-sh5.c
> +++ b/arch/sh/kernel/cpu/sh5/clock-sh5.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
>  /*

Why are some of these using //

> --- a/arch/sh/kernel/cpu/sh5/entry.S
> +++ b/arch/sh/kernel/cpu/sh5/entry.S
> @@ -1,13 +1,10 @@
> -/*
> +/* SPDX-License-Identifier: GPL-2.0
> + *
>   * arch/sh/kernel/cpu/sh5/entry.S

When others are extending the exiting /* block?

Rob

P.S. sh5 was a prototype architecture that never actually shipped, and
should probably be removed. The j-core guys have a different 64-bit strategy
(an x86-64 style extension of the existing instruction set rather an an
itanium-style unrelated whole new second instruction set.)

Not objecting to the patch, just... for Rich's todo list. :)

Re: [PATCH resend 09/13] sh: sh5: convert to SPDX identifiers

[Geert Uytterhoeven]

Hi Rob,

On Thu, Nov 8, 2018 at 7:25 PM Rob Landley <rob@landley.net> wrote:
> On 11/8/18 12:28 AM, Kuninori Morimoto wrote:>
> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >
> > This patch updates license to use SPDX-License-Identifier
> > instead of verbose license text.
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> > ---
> >  arch/sh/kernel/cpu/sh5/clock-sh5.c | 5 +----
> >  arch/sh/kernel/cpu/sh5/entry.S     | 7 ++-----
> >  arch/sh/kernel/cpu/sh5/fpu.c       | 5 +----
> >  arch/sh/kernel/cpu/sh5/probe.c     | 5 +----
> >  arch/sh/kernel/cpu/sh5/setup-sh5.c | 5 +----
> >  arch/sh/kernel/cpu/sh5/switchto.S  | 7 ++-----
> >  arch/sh/kernel/cpu/sh5/unwind.c    | 5 +----
> >  7 files changed, 9 insertions(+), 30 deletions(-)
> >
> > diff --git a/arch/sh/kernel/cpu/sh5/clock-sh5.c b/arch/sh/kernel/cpu/sh5/clock-sh5.c
> > index c48b93d..43763c2 100644
> > --- a/arch/sh/kernel/cpu/sh5/clock-sh5.c
> > +++ b/arch/sh/kernel/cpu/sh5/clock-sh5.c
> > @@ -1,13 +1,10 @@
> > +// SPDX-License-Identifier: GPL-2.0
> >  /*
>
> Why are some of these using //
>
> > --- a/arch/sh/kernel/cpu/sh5/entry.S
> > +++ b/arch/sh/kernel/cpu/sh5/entry.S
> > @@ -1,13 +1,10 @@
> > -/*
> > +/* SPDX-License-Identifier: GPL-2.0
> > + *
> >   * arch/sh/kernel/cpu/sh5/entry.S
>
> When others are extending the exiting /* block?

Documentation/process/license-rules.rst

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH resend 09/13] sh: sh5: convert to SPDX identifiers

[Rob Landley]

On 11/8/18 1:32 PM, Geert Uytterhoeven wrote:
>> When others are extending the exiting /* block?
> 
> Documentation/process/license-rules.rst

Ah, sorry. I've fallen way behind on the bureaucratization of Linux development,
I only read the first ~3 screens of text of that file and didn't get down to the
part about the procedure requiring a different comment style for .h files vs .c
files.

Good to know,

Rob

Re: [PATCH resend 09/13] sh: sh5: convert to SPDX identifiers

[Kuninori Morimoto]

Hi Geert, Rob

> >> When others are extending the exiting /* block?
> > 
> > Documentation/process/license-rules.rst
> 
> Ah, sorry. I've fallen way behind on the bureaucratization of Linux development,
> I only read the first ~3 screens of text of that file and didn't get down to the
> part about the procedure requiring a different comment style for .h files vs .c
> files.

Thank you for your help