[PATCH 3/3] ARM: shmobile: convert to SPDX identifier
Signed-off-by: Wolfram Sang --- arch/arm/include/debug/renesas-scif.S | 5 + arch/arm/mach-shmobile/headsmp-apmu.S | 5 + arch/arm/mach-shmobile/platsmp-apmu.c | 5 + arch/arm/mach-shmobile/platsmp-apmu.h | 10 +- arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 10 +- arch/arm/mach-shmobile/setup-emev2.c | 10 +- arch/arm/mach-shmobile/setup-r7s72100.c| 10 +- arch/arm/mach-shmobile/setup-r8a73a4.c | 10 +- arch/arm/mach-shmobile/setup-r8a7740.c | 10 +- arch/arm/mach-shmobile/setup-r8a7778.c | 10 +- arch/arm/mach-shmobile/setup-r8a7779.c | 10 +- arch/arm/mach-shmobile/setup-r8a7790.c | 10 +- arch/arm/mach-shmobile/setup-r8a7791.c | 10 +- arch/arm/mach-shmobile/setup-rcar-gen2.c | 10 +- arch/arm/mach-shmobile/setup-sh73a0.c | 10 +- arch/arm/mach-shmobile/smp-emev2.c | 10 +- arch/arm/mach-shmobile/smp-r8a7779.c | 10 +- arch/arm/mach-shmobile/smp-r8a7790.c | 10 +- arch/arm/mach-shmobile/smp-r8a7791.c | 10 +- 19 files changed, 19 insertions(+), 156 deletions(-) diff --git a/arch/arm/include/debug/renesas-scif.S b/arch/arm/include/debug/renesas-scif.S index 97820a8df51a..1c5f795587fc 100644 --- a/arch/arm/include/debug/renesas-scif.S +++ b/arch/arm/include/debug/renesas-scif.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Renesas SCIF(A) debugging macro include header * @@ -5,10 +6,6 @@ * * Copyright (C) 2012-2013 Renesas Electronics Corporation * Copyright (C) 1994-1999 Russell King - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #define SCIF_PHYS CONFIG_DEBUG_UART_PHYS diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S index 5672b5849401..94897f7f294c 100644 --- a/arch/arm/mach-shmobile/headsmp-apmu.S +++ b/arch/arm/mach-shmobile/headsmp-apmu.S @@ -1,11 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * SMP support for APMU based systems with Cortex A7/A15 * * Copyright (C) 2014 Renesas Electronics Corporation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c index ba732effc90b..da64f5f56003 100644 --- a/arch/arm/mach-shmobile/platsmp-apmu.c +++ b/arch/arm/mach-shmobile/platsmp-apmu.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SMP support for SoCs with APMU * * Copyright (C) 2014 Renesas Electronics Corporation * Copyright (C) 2013 Magnus Damm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include #include diff --git a/arch/arm/mach-shmobile/platsmp-apmu.h b/arch/arm/mach-shmobile/platsmp-apmu.h index 76512c9a2545..81169337dea5 100644 --- a/arch/arm/mach-shmobile/platsmp-apmu.h +++ b/arch/arm/mach-shmobile/platsmp-apmu.h @@ -1,16 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * rmobile apmu definition * * Copyright (C) 2014 Renesas Electronics Corporation - * - * This program 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; version 2 of the License. - * - * This program 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. */ #ifndef PLATSMP_APMU_H diff --git a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c index 93f628acfd94..21ebc7678ffd 100644 --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * R-Car Generation 2 da9063/da9210 regulator quirk * @@ -16,15 +17,6 @@ * been initialized, but before the i2c slave drivers are initialized. * * Copyright (C) 2015 Glider bvba - * - * This program 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; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRAN
RE: [PATCH 3/3] ARM: shmobile: convert to SPDX identifier
Hi Wolfram-san, Thank you for the patch! > From: Wolfram Sang, Sent: Monday, June 11, 2018 11:50 PM > > Signed-off-by: Wolfram Sang > --- > arch/arm/include/debug/renesas-scif.S | 5 + > arch/arm/mach-shmobile/headsmp-apmu.S | 5 + > arch/arm/mach-shmobile/platsmp-apmu.c | 5 + > arch/arm/mach-shmobile/platsmp-apmu.h | 10 +- I tried to apply this patch on renesas-devel-20180608-v4.17 and platsmp-apmu.h and other files were removed. So, I guess you need rebase. After rebased: Acked-by: Yoshihiro Shimoda Best regards, Yoshihiro Shimoda > arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 10 +- > arch/arm/mach-shmobile/setup-emev2.c | 10 +- > arch/arm/mach-shmobile/setup-r7s72100.c| 10 +- > arch/arm/mach-shmobile/setup-r8a73a4.c | 10 +- > arch/arm/mach-shmobile/setup-r8a7740.c | 10 +- > arch/arm/mach-shmobile/setup-r8a7778.c | 10 +- > arch/arm/mach-shmobile/setup-r8a7779.c | 10 +- > arch/arm/mach-shmobile/setup-r8a7790.c | 10 +- > arch/arm/mach-shmobile/setup-r8a7791.c | 10 +- > arch/arm/mach-shmobile/setup-rcar-gen2.c | 10 +- > arch/arm/mach-shmobile/setup-sh73a0.c | 10 +- > arch/arm/mach-shmobile/smp-emev2.c | 10 +- > arch/arm/mach-shmobile/smp-r8a7779.c | 10 +- > arch/arm/mach-shmobile/smp-r8a7790.c | 10 +- > arch/arm/mach-shmobile/smp-r8a7791.c | 10 +- > 19 files changed, 19 insertions(+), 156 deletions(-) > > diff --git a/arch/arm/include/debug/renesas-scif.S > b/arch/arm/include/debug/renesas-scif.S > index 97820a8df51a..1c5f795587fc 100644 > --- a/arch/arm/include/debug/renesas-scif.S > +++ b/arch/arm/include/debug/renesas-scif.S > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > /* > * Renesas SCIF(A) debugging macro include header > * > @@ -5,10 +6,6 @@ > * > * Copyright (C) 2012-2013 Renesas Electronics Corporation > * Copyright (C) 1994-1999 Russell King > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > */ > > #define SCIF_PHYSCONFIG_DEBUG_UART_PHYS > diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S > b/arch/arm/mach-shmobile/headsmp-apmu.S > index 5672b5849401..94897f7f294c 100644 > --- a/arch/arm/mach-shmobile/headsmp-apmu.S > +++ b/arch/arm/mach-shmobile/headsmp-apmu.S > @@ -1,11 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > /* > * SMP support for APMU based systems with Cortex A7/A15 > * > * Copyright (C) 2014 Renesas Electronics Corporation > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > */ > > #include > diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c > b/arch/arm/mach-shmobile/platsmp-apmu.c > index ba732effc90b..da64f5f56003 100644 > --- a/arch/arm/mach-shmobile/platsmp-apmu.c > +++ b/arch/arm/mach-shmobile/platsmp-apmu.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* > * SMP support for SoCs with APMU > * > * Copyright (C) 2014 Renesas Electronics Corporation > * Copyright (C) 2013 Magnus Damm > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > */ > #include > #include > diff --git a/arch/arm/mach-shmobile/platsmp-apmu.h > b/arch/arm/mach-shmobile/platsmp-apmu.h > index 76512c9a2545..81169337dea5 100644 > --- a/arch/arm/mach-shmobile/platsmp-apmu.h > +++ b/arch/arm/mach-shmobile/platsmp-apmu.h > @@ -1,16 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > /* > * rmobile apmu definition > * > * Copyright (C) 2014 Renesas Electronics Corporation > - * > - * This program 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; version 2 of the License. > - * > - * This program 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. > */ > > #ifndef PLATSMP_APMU_H > diff --git a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > index 93f628acfd94..21ebc7678ffd 100644 > --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c > @@ -1,3 +1,4 @
Re: [PATCH 3/3] ARM: shmobile: convert to SPDX identifier
On Mon, Jun 11, 2018 at 11:49:37PM +0900, Wolfram Sang wrote: > Signed-off-by: Wolfram Sang > --- > arch/arm/include/debug/renesas-scif.S | 5 + > arch/arm/mach-shmobile/headsmp-apmu.S | 5 + > arch/arm/mach-shmobile/platsmp-apmu.c | 5 + > arch/arm/mach-shmobile/platsmp-apmu.h | 10 +- > arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 10 +- > arch/arm/mach-shmobile/setup-emev2.c | 10 +- > arch/arm/mach-shmobile/setup-r7s72100.c| 10 +- > arch/arm/mach-shmobile/setup-r8a73a4.c | 10 +- > arch/arm/mach-shmobile/setup-r8a7740.c | 10 +- > arch/arm/mach-shmobile/setup-r8a7778.c | 10 +- > arch/arm/mach-shmobile/setup-r8a7779.c | 10 +- > arch/arm/mach-shmobile/setup-r8a7790.c | 10 +- > arch/arm/mach-shmobile/setup-r8a7791.c | 10 +- > arch/arm/mach-shmobile/setup-rcar-gen2.c | 10 +- > arch/arm/mach-shmobile/setup-sh73a0.c | 10 +- > arch/arm/mach-shmobile/smp-emev2.c | 10 +- > arch/arm/mach-shmobile/smp-r8a7779.c | 10 +- > arch/arm/mach-shmobile/smp-r8a7790.c | 10 +- > arch/arm/mach-shmobile/smp-r8a7791.c | 10 +- > 19 files changed, 19 insertions(+), 156 deletions(-) This does not apply cleanly on top of renesas-devel-20180608-v4.17. Please rebase.
Re: [PATCH 3/3] ARM: shmobile: convert to SPDX identifier
> This does not apply cleanly on top of renesas-devel-20180608-v4.17. > > Please rebase. Sorry, seems I missed an update to renesas/devel :( Will rebase and resend. signature.asc Description: PGP signature
Re: [PATCH 3/3] ARM: shmobile: convert to SPDX identifier
On Thu, Jun 14, 2018 at 10:43:48AM +0900, Wolfram Sang wrote: > > > This does not apply cleanly on top of renesas-devel-20180608-v4.17. > > > > Please rebase. > > Sorry, seems I missed an update to renesas/devel :( Will rebase and > resend. Thanks Wolfram, much appreciated.
