[ASIS-4 patch 0/5] Deep review of 'AS IS' disclaimers - part 4

[ASIS-4 patch 0/5] Deep review of 'AS IS' disclaimers - part 4

[Thomas Gleixner]

This is the forth variant of disclaimer modifications.

Standard disclaimer:

    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

Modified disclaimer:

    the/this program is licensed as is without any warranty of any kind whether
    express or implied

As with the previous 3, I don't see anything contradicting or substantially
different.

In case we agree on that, I would amend the changelogs of the individual
patches with a paragraph explaining our conclusion. Something along the
lines:

    The pattern deviates from the standard GPLv2 disclaimer, but the
    modifications do not expand beyond the standard disclaimer and the NO
    WARRANTY section of the GPLv2. So replacing the license notice
    including the modified disclaimer with the SPDX license identifier
    results in the same protections and conditions.

Feel free to suggest better wording or deeper explanation.

Thanks,

        tglx

[ASIS-4 patch 1/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 80

[Thomas Gleixner]

From: Thomas Gleixner tglx@linutronix.de

Based on 1 normalized pattern(s):

  this file is licensed under the terms of the gnu general public
  license version 2 or later this program is licensed as is without
  any warranty of any kind whether express or implied

extracted by the scancode license scanner the SPDX license identifier

  GPL-2.0-or-later

has been chosen to replace the boilerplate/reference in 2 file(s).

Bucket: ASIS-4

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-4&id=df762621324a
---
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c |    5 +----
 drivers/watchdog/sp805_wdt.c                |    5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Marvell 37xx SoC pinctrl driver
  *
  * Copyright (C) 2017 Marvell
  *
  * Gregory CLEMENT <gregory.clement@free-electrons.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2 or later. This program is licensed "as is"
- * without any warranty of any kind, whether express or implied.
  */
 
 #include <linux/gpio/driver.h>
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * drivers/char/watchdog/sp805-wdt.c
  *
@@ -5,10 +6,6 @@
  *
  * Copyright (C) 2010 ST Microelectronics
  * Viresh Kumar <vireshk@kernel.org>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2 or later. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/acpi.h>

Re: [ASIS-4 patch 1/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 80

[Enrico Weigelt, metux IT consult]

On 05.06.19 15:18, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
> 
> Based on 1 normalized pattern(s):
> 
>    this file is licensed under the terms of the gnu general public
>    license version 2 or later this program is licensed as is without
>    any warranty of any kind whether express or implied
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>    GPL-2.0-or-later
> 
> has been chosen to replace the boilerplate/reference in 2 file(s).
> 
> Bucket: ASIS-4
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> 
> ---
> https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-4&id=df762621324a
> ---
>   drivers/pinctrl/mvebu/pinctrl-armada-37xx.c |    5 +----
>   drivers/watchdog/sp805_wdt.c                |    5 +----
>   2 files changed, 2 insertions(+), 8 deletions(-)
> 
> --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
> +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>   /*
>    * Marvell 37xx SoC pinctrl driver
>    *
>    * Copyright (C) 2017 Marvell
>    *
>    * Gregory CLEMENT <gregory.clement@free-electrons.com>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2 or later. This program is licensed "as is"
> - * without any warranty of any kind, whether express or implied.
>    */
>   
>   #include <linux/gpio/driver.h>
> --- a/drivers/watchdog/sp805_wdt.c
> +++ b/drivers/watchdog/sp805_wdt.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>   /*
>    * drivers/char/watchdog/sp805-wdt.c
>    *
> @@ -5,10 +6,6 @@
>    *
>    * Copyright (C) 2010 ST Microelectronics
>    * Viresh Kumar <vireshk@kernel.org>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2 or later. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   #include <linux/acpi.h>
> 
> 
Reviewed-By: Enrico Weigelt <info@metux.net>

-- 
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
info@metux.net -- +49-151-27565287

Re: [ASIS-4 patch 1/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 80

[Allison Randal]

On 6/5/19 11:18 AM, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
> 
> Based on 1 normalized pattern(s):
> 
>   this file is licensed under the terms of the gnu general public
>   license version 2 or later this program is licensed as is without
>   any warranty of any kind whether express or implied
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>   GPL-2.0-or-later
> 
> has been chosen to replace the boilerplate/reference in 2 file(s).
> 
> Bucket: ASIS-4
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Reviewed-by: Allison Randal <allison@lohutok.net>

[ASIS-4 patch 2/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 374

[Thomas Gleixner]

From: Thomas Gleixner tglx@linutronix.de

Based on 1 normalized pattern(s):

  this file is licensed under the terms of the gnu general public
  license version 2 this program as licensed as is without any
  warranty of any kind whether express or implied

extracted by the scancode license scanner the SPDX license identifier

  GPL-2.0-only

has been chosen to replace the boilerplate/reference in 1 file(s).

Bucket: ASIS-4

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-4&id=4d6ad150bc12
---
 arch/powerpc/kernel/kgdb.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * PowerPC backend to the KGDB stub.
  *
@@ -8,10 +9,6 @@
  * PPC32 support restored by Vitaly Wool <vwool@ru.mvista.com> and
  * Sergei Shtylyov <sshtylyov@ru.mvista.com>
  * Copyright (C) 2007-2008 Wind River Systems, Inc.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program as licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <linux/kernel.h>

Re: [ASIS-4 patch 2/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 374

[Enrico Weigelt, metux IT consult]

On 05.06.19 15:18, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
> 
> Based on 1 normalized pattern(s):
> 
>    this file is licensed under the terms of the gnu general public
>    license version 2 this program as licensed as is without any
>    warranty of any kind whether express or implied
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>    GPL-2.0-only
> 
> has been chosen to replace the boilerplate/reference in 1 file(s).
> 
> Bucket: ASIS-4
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> 
> ---
> https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-4&id=4d6ad150bc12
> ---
>   arch/powerpc/kernel/kgdb.c |    5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
> 
> --- a/arch/powerpc/kernel/kgdb.c
> +++ b/arch/powerpc/kernel/kgdb.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * PowerPC backend to the KGDB stub.
>    *
> @@ -8,10 +9,6 @@
>    * PPC32 support restored by Vitaly Wool <vwool@ru.mvista.com> and
>    * Sergei Shtylyov <sshtylyov@ru.mvista.com>
>    * Copyright (C) 2007-2008 Wind River Systems, Inc.
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2. This program as licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <linux/kernel.h>
> 
> 
Reviewed-By: Enrico Weigelt <info@metux.net>

-- 
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
info@metux.net -- +49-151-27565287

Re: [ASIS-4 patch 2/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 374

[Allison Randal]

On 6/5/19 11:18 AM, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
> 
> Based on 1 normalized pattern(s):
> 
>   this file is licensed under the terms of the gnu general public
>   license version 2 this program as licensed as is without any
>   warranty of any kind whether express or implied
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>   GPL-2.0-only
> 
> has been chosen to replace the boilerplate/reference in 1 file(s).
> 
> Bucket: ASIS-4
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Reviewed-by: Allison Randal <allison@lohutok.net>

[ASIS-4 patch 3/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 381

[Thomas Gleixner]

From: Thomas Gleixner tglx@linutronix.de

Based on 1 normalized pattern(s):

  this file is licensed under the term of the gnu general public
  license version 2 the program licensed as is without any warranty of
  any kind whether express or implied

extracted by the scancode license scanner the SPDX license identifier

  GPL-2.0-only

has been chosen to replace the boilerplate/reference in 2 file(s).

Bucket: ASIS-4

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-4&id=951b218c389d
---
 drivers/dma/ppc4xx/dma.h |    5 +----
 drivers/dma/ppc4xx/xor.h |    5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

--- a/drivers/dma/ppc4xx/dma.h
+++ b/drivers/dma/ppc4xx/dma.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * 440SPe's DMA engines support header file
  *
  * 2006-2009 (C) DENX Software Engineering.
  *
  * Author: Yuri Tikhonov <yur@emcraft.com>
- *
- * This file is licensed under the term of  the GNU General Public License
- * version 2. The program licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #ifndef	_PPC440SPE_DMA_H
--- a/drivers/dma/ppc4xx/xor.h
+++ b/drivers/dma/ppc4xx/xor.h
@@ -1,13 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * 440SPe's XOR engines support header file
  *
  * 2006-2009 (C) DENX Software Engineering.
  *
  * Author: Yuri Tikhonov <yur@emcraft.com>
- *
- * This file is licensed under the term of  the GNU General Public License
- * version 2. The program licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #ifndef _PPC440SPE_XOR_H

Re: [ASIS-4 patch 3/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 381

[Enrico Weigelt, metux IT consult]

On 05.06.19 15:18, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
> 
> Based on 1 normalized pattern(s):
> 
>    this file is licensed under the term of the gnu general public
>    license version 2 the program licensed as is without any warranty of
>    any kind whether express or implied
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>    GPL-2.0-only
> 
> has been chosen to replace the boilerplate/reference in 2 file(s).
> 
> Bucket: ASIS-4
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> 
> ---
> https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-4&id=951b218c389d
> ---
>   drivers/dma/ppc4xx/dma.h |    5 +----
>   drivers/dma/ppc4xx/xor.h |    5 +----
>   2 files changed, 2 insertions(+), 8 deletions(-)
> 
> --- a/drivers/dma/ppc4xx/dma.h
> +++ b/drivers/dma/ppc4xx/dma.h
> @@ -1,13 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * 440SPe's DMA engines support header file
>    *
>    * 2006-2009 (C) DENX Software Engineering.
>    *
>    * Author: Yuri Tikhonov <yur@emcraft.com>
> - *
> - * This file is licensed under the term of  the GNU General Public License
> - * version 2. The program licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #ifndef	_PPC440SPE_DMA_H
> --- a/drivers/dma/ppc4xx/xor.h
> +++ b/drivers/dma/ppc4xx/xor.h
> @@ -1,13 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * 440SPe's XOR engines support header file
>    *
>    * 2006-2009 (C) DENX Software Engineering.
>    *
>    * Author: Yuri Tikhonov <yur@emcraft.com>
> - *
> - * This file is licensed under the term of  the GNU General Public License
> - * version 2. The program licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #ifndef _PPC440SPE_XOR_H
> 
> 
Reviewed-By: Enrico Weigelt <info@metux.net>

-- 
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
info@metux.net -- +49-151-27565287

Re: [ASIS-4 patch 3/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 381

[Allison Randal]

On 6/5/19 11:18 AM, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
> 
> Based on 1 normalized pattern(s):
> 
>   this file is licensed under the term of the gnu general public
>   license version 2 the program licensed as is without any warranty of
>   any kind whether express or implied
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>   GPL-2.0-only
> 
> has been chosen to replace the boilerplate/reference in 2 file(s).
> 
> Bucket: ASIS-4
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Reviewed-by: Allison Randal <allison@lohutok.net>

[ASIS-4 patch 4/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 470

[Thomas Gleixner]

From: Thomas Gleixner tglx@linutronix.de

Based on 1 normalized pattern(s):

  this file is licensed under the terms of the gnu general public
  license version 2 this program is licensed as is without any
  warranty of any kind whether express or implied

extracted by the scancode license scanner the SPDX license identifier

  GPL-2.0-only

has been chosen to replace the boilerplate/reference in 586 file(s).

Bucket: ASIS-4

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-4&id=9bb438736896
---
 arch/arm/boot/dts/am33xx.dtsi                             |    5 +----
 arch/arm/boot/dts/am3517.dtsi                             |    5 +----
 arch/arm/boot/dts/am4372.dtsi                             |    5 +----
 arch/arm/boot/dts/artpec6-devboard.dts                    |    5 +----
 arch/arm/boot/dts/dm814x.dtsi                             |    4 +---
 arch/arm/boot/dts/dm816x.dtsi                             |    4 +---
 arch/arm/boot/dts/dra62x.dtsi                             |    4 +---
 arch/arm/boot/dts/dra7-dspeve-thermal.dtsi                |    5 +----
 arch/arm/boot/dts/dra7-iva-thermal.dtsi                   |    5 +----
 arch/arm/boot/dts/imx6q-gk802.dts                         |    5 +----

SNIP

 arch/powerpc/sysdev/cpm2.c                                |    5 +----
 arch/powerpc/sysdev/cpm2_pic.c                            |    5 +----
 arch/powerpc/sysdev/ehv_pic.c                             |    5 +----
 arch/powerpc/sysdev/ge/ge_pic.c                           |    5 +----
 arch/powerpc/sysdev/rtc_cmos_setup.c                      |    6 ++----
 arch/powerpc/sysdev/xilinx_intc.c                         |    6 +-----
 arch/powerpc/sysdev/xilinx_pci.c                          |    5 +----
 drivers/ata/ahci_mvebu.c                                  |    5 +----
 drivers/ata/pata_arasan_cf.c                              |    5 +----
 drivers/ata/pata_mpc52xx.c                                |    5 +----
 drivers/bus/imx-weim.c                                    |    5 +----
 drivers/bus/mvebu-mbus.c                                  |    5 +----
 drivers/bus/sunxi-rsb.c                                   |    6 +-----
 drivers/bus/tegra-gmi.c                                   |    5 +----
 drivers/bus/ts-nbus.c                                     |    5 +----
 drivers/char/hw_random/amd-rng.c                          |    5 +----
 drivers/char/hw_random/atmel-rng.c                        |    5 +----
 drivers/char/hw_random/geode-rng.c                        |    5 +----

SNIP

 drivers/watchdog/max63xx_wdt.c                            |    5 +----
 drivers/watchdog/moxart_wdt.c                             |    5 +----
 drivers/watchdog/mv64x60_wdt.c                            |    4 +---
 drivers/watchdog/omap_wdt.c                               |    6 ++----
 drivers/watchdog/orion_wdt.c                              |    5 +----
 drivers/watchdog/pnx4008_wdt.c                            |    5 +----
 drivers/watchdog/sbc_fitpc2_wdt.c                         |    5 +----
 drivers/watchdog/ts4800_wdt.c                             |    5 +----
 drivers/watchdog/ts72xx_wdt.c                             |    5 +----
 include/dt-bindings/leds/leds-netxbig.h                   |    5 +----
 include/dt-bindings/leds/leds-pca9532.h                   |    5 +----
 include/dt-bindings/leds/leds-pca955x.h                   |    5 +----
 include/linux/amba/sp810.h                                |    5 +----
 include/linux/davinci_emac.h                              |    6 ++----
 include/linux/dmapool.h                                   |    5 +----
 include/linux/edac.h                                      |    7 ++-----
 include/linux/fs_enet_pd.h                                |    5 +----
 include/linux/fs_uart_pd.h                                |    5 +----
 include/linux/fsl/bestcomm/ata.h                          |    6 +-----
 include/linux/fsl/bestcomm/bestcomm.h                     |    6 +-----
 include/linux/fsl/bestcomm/bestcomm_priv.h                |    5 +----
 include/linux/fsl/bestcomm/fec.h                          |    6 +-----
 include/linux/fsl/bestcomm/sram.h                         |    6 +-----
 include/linux/irqchip.h                                   |    5 +----
 include/linux/kgdb.h                                      |    4 +---
 include/linux/mbus.h                                      |    5 +----
 include/linux/mtd/latch-addr-flash.h                      |    5 +----
 include/linux/mtd/spear_smi.h                             |    5 +----
 include/linux/mvebu-pmsu.h                                |    5 +----
 include/linux/pata_arasan_cf_data.h                       |    5 +----
 include/linux/platform_data/i2c-davinci.h                 |    6 ++----
 include/linux/platform_data/keyboard-spear.h              |    5 +----
 include/linux/platform_data/leds-kirkwood-netxbig.h       |    5 +----
 include/linux/platform_data/leds-kirkwood-ns2.h           |    5 +----
 include/linux/platform_data/media/si4713.h                |    6 +-----
 include/linux/platform_data/mtd-davinci-aemif.h           |    5 +----
 include/linux/platform_data/mtd-orion_nand.h              |    4 +---
 include/linux/platform_data/usb-davinci.h                 |    5 +----
 include/linux/platform_data/usb-ehci-orion.h              |    4 +---
 include/linux/soc/sunxi/sunxi_sram.h                      |    5 +----
 include/linux/sunxi-rsb.h                                 |    5 +----
 include/linux/ts-nbus.h                                   |    5 +----
 include/video/da8xx-fb.h                                  |    5 +----
 kernel/debug/debug_core.c                                 |    5 +----
 kernel/debug/debug_core.h                                 |    5 +----
 kernel/debug/gdbstub.c                                    |    5 +----
 kernel/debug/kdb/kdb_debugger.c                           |    5 +----
 samples/kdb/kdb_hello.c                                   |    5 +----
 sound/soc/codecs/cs4270.c                                 |    4 +---
 sound/soc/codecs/cs42xx8-i2c.c                            |    5 +----
 sound/soc/codecs/cs42xx8.c                                |    5 +----
 sound/soc/codecs/cs42xx8.h                                |    5 +----
 sound/soc/codecs/sta529.c                                 |    5 +----
 sound/soc/dwc/dwc-i2s.c                                   |    5 +----
 sound/soc/dwc/dwc-pcm.c                                   |    5 +----
 sound/soc/dwc/local.h                                     |    5 +----
 sound/soc/fsl/efika-audio-fabric.c                        |    5 +----
 sound/soc/spear/spdif_in.c                                |    5 +----
 sound/soc/spear/spdif_out.c                               |    5 +----
 sound/soc/spear/spear_pcm.c                               |    5 +----
 586 files changed, 646 insertions(+), 2368 deletions(-)

--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for AM33XX SoC
  *
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/bus/ti-sysc.h>
--- a/arch/arm/boot/dts/am3517.dtsi
+++ b/arch/arm/boot/dts/am3517.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for am3517 SoC
  *
  * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include "omap3.dtsi"
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for AM4372 SoC
  *
  * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/bus/ti-sysc.h>
--- a/arch/arm/boot/dts/artpec6-devboard.dts
+++ b/arch/arm/boot/dts/artpec6-devboard.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Axis ARTPEC-6 development board.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 /dts-v1/;
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -1,7 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/gpio/gpio.h>
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -1,7 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/gpio/gpio.h>
--- a/arch/arm/boot/dts/dra62x.dtsi
+++ b/arch/arm/boot/dts/dra62x.dtsi
@@ -1,7 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include "dm814x.dtsi"
--- a/arch/arm/boot/dts/dra7-dspeve-thermal.dtsi
+++ b/arch/arm/boot/dts/dra7-dspeve-thermal.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for DRA7x SoC DSPEVE thermal
  *
  * Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/thermal/thermal.h>
--- a/arch/arm/boot/dts/dra7-iva-thermal.dtsi
+++ b/arch/arm/boot/dts/dra7-iva-thermal.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for DRA7x SoC IVA thermal
  *
  * Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/thermal/thermal.h>
--- a/arch/arm/boot/dts/imx6q-gk802.dts
+++ b/arch/arm/boot/dts/imx6q-gk802.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2013 Philipp Zabel
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 /dts-v1/;
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP2 SoC
  *
  * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/gpio/gpio.h>
--- a/arch/arm/boot/dts/omap2420.dtsi
+++ b/arch/arm/boot/dts/omap2420.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP2420 SoC
  *
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include "omap2.dtsi"
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP243x SoC
  *
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include "omap2.dtsi"
--- a/arch/arm/boot/dts/omap3-cpu-thermal.dtsi
+++ b/arch/arm/boot/dts/omap3-cpu-thermal.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP3 SoC CPU thermal
  *
  * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/thermal/thermal.h>
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP3 SoC
  *
  * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/gpio/gpio.h>
--- a/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP34xx/OMAP35xx SoC
  *
  * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/bus/ti-sysc.h>
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP3 SoC
  *
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/bus/ti-sysc.h>
--- a/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
+++ b/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP4/5 SoC CPU thermal
  *
  * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
  * Contact: Eduardo Valentin <eduardo.valentin@ti.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/thermal/thermal.h>
--- a/arch/arm/boot/dts/omap443x.dtsi
+++ b/arch/arm/boot/dts/omap443x.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP443x SoC
  *
  * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include "omap4.dtsi"
--- a/arch/arm/boot/dts/omap4460.dtsi
+++ b/arch/arm/boot/dts/omap4460.dtsi
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP4460 SoC
  *
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 #include "omap4.dtsi"
 
--- a/arch/arm/boot/dts/omap5-core-thermal.dtsi
+++ b/arch/arm/boot/dts/omap5-core-thermal.dtsi
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP543x SoC CORE thermal
  *
  * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
  * Contact: Eduardo Valentin <eduardo.valentin@ti.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/thermal/thermal.h>
--- a/arch/arm/boot/dts/omap5-gpu-thermal.dtsi
+++ b/arch/arm/boot/dts/omap5-gpu-thermal.dtsi
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Device Tree Source for OMAP543x SoC GPU thermal
  *
  * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
  * Contact: Eduardo Valentin <eduardo.valentin@ti.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 
 #include <dt-bindings/thermal/thermal.h>
--- a/arch/arm/boot/dts/orion5x-lacie-d2-network.dts
+++ b/arch/arm/boot/dts/orion5x-lacie-d2-network.dts
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  * Copyright (C) 2009 Simon Guinot <sguinot@lacie.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
--- a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
+++ b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /*
--- a/arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
+++ b/arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  * Copyright (C) Sylver Bruneau <sylver.bruneau@googlemail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
--- a/arch/arm/boot/dts/orion5x-mv88f5181.dtsi
+++ b/arch/arm/boot/dts/orion5x-mv88f5181.dtsi
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2016 Jamie Lentin <jm@lentin.co.uk>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include "orion5x.dtsi"
--- a/arch/arm/boot/dts/orion5x-mv88f5182.dtsi
+++ b/arch/arm/boot/dts/orion5x-mv88f5182.dtsi
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include "orion5x.dtsi"
--- a/arch/arm/boot/dts/orion5x-netgear-wnr854t.dts
+++ b/arch/arm/boot/dts/orion5x-netgear-wnr854t.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2016 Jamie Lentin <jm@lentin.co.uk>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
--- a/arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
+++ b/arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /dts-v1/;
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
--- a/arch/arm/include/asm/hardware/cache-feroceon-l2.h
+++ b/arch/arm/include/asm/hardware/cache-feroceon-l2.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * arch/arm/include/asm/hardware/cache-feroceon-l2.h
  *
  * Copyright (C) 2008 Marvell Semiconductor
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 extern void __init feroceon_l2_init(int l2_wt_override);
--- a/arch/arm/include/asm/hardware/cache-tauros2.h
+++ b/arch/arm/include/asm/hardware/cache-tauros2.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * arch/arm/include/asm/hardware/cache-tauros2.h
  *
  * Copyright (C) 2008 Marvell Semiconductor
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #define CACHE_TAUROS2_PREFETCH_ON	(1 << 0)
--- a/arch/arm/include/asm/hardware/entry-macro-iomd.S
+++ b/arch/arm/include/asm/hardware/entry-macro-iomd.S
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * arch/arm/include/asm/hardware/entry-macro-iomd.S
  *
  * Low-level IRQ helper macros for IOC/IOMD based platforms
- *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 /* IOC / IOMD based hardware */
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -1,13 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * TI DA830/OMAP L137 EVM board
  *
  * Author: Mark A. Greer <mgreer@mvista.com>
  * Derived from: arch/arm/mach-davinci/board-dm644x-evm.c
  *
- * 2007, 2009 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007, 2009 (c) MontaVista Software, Inc.
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * TI DA850/OMAP-L138 EVM board
  *
@@ -6,10 +7,7 @@
  * Derived from: arch/arm/mach-davinci/board-da830-evm.c
  * Original Copyrights follow:
  *
- * 2007, 2009 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007, 2009 (c) MontaVista Software, Inc.
  */
 #include <linux/console.h>
 #include <linux/delay.h>
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * TI DaVinci EVM board support
  *
  * Author: Kevin Hilman, Deep Root Systems, LLC
  *
- * 2007 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007 (c) MontaVista Software, Inc.
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * DM355 leopard board support
  *
  * Based on board-dm355-evm.c
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * TI DaVinci EVM board support
  *
  * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>
  *
- * 2007 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007 (c) MontaVista Software, Inc.
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * TI DaVinci DM646X EVM board
  *
@@ -5,11 +6,6 @@
  * Copyright (C) 2006 Texas Instruments.
  *
  * (C) 2007-2008, MontaVista Software, Inc.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- *
  */
 
 /**************************************************************************
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Critical Link MityOMAP-L138 SoM
  *
  * Copyright (C) 2010 Critical Link LLC - http://www.criticallink.com
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of
- * any kind, whether express or implied.
  */
 
 #define pr_fmt(fmt) "MityOMAPL138: " fmt
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Neuros Technologies OSD2 board support
  *
@@ -18,10 +19,6 @@
  *
  * For more information please refer to
  * 		http://wiki.neurostechnology.com/index.php/OSD_2.0_HD
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -1,13 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Hawkboard.org based on TI's OMAP-L138 Platform
  *
  * Initial code: Syed Mohammed Khasim
  *
  * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of
- * any kind, whether express or implied.
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
--- a/arch/arm/mach-davinci/common.c
+++ b/arch/arm/mach-davinci/common.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Code commons to all DaVinci SoCs.
  *
  * Author: Mark A. Greer <mgreer@mvista.com>
  *
- * 2009 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2009 (c) MontaVista Software, Inc.
  */
 #include <linux/module.h>
 #include <linux/io.h>
--- a/arch/arm/mach-davinci/cpuidle.h
+++ b/arch/arm/mach-davinci/cpuidle.h
@@ -1,11 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * TI DaVinci cpuidle platform support
  *
  * 2009 (C) Texas Instruments, Inc. http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
  */
 #ifndef _MACH_DAVINCI_CPUIDLE_H
 #define _MACH_DAVINCI_CPUIDLE_H
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * TI DA830/OMAP L137 chip specific setup
  *
  * Author: Mark A. Greer <mgreer@mvista.com>
  *
- * 2009 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2009 (c) MontaVista Software, Inc.
  */
 #include <linux/clk-provider.h>
 #include <linux/clk/davinci.h>
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * TI DA850/OMAP-L138 chip specific setup
  *
@@ -6,10 +7,7 @@
  * Derived from: arch/arm/mach-davinci/da830.c
  * Original Copyrights follow:
  *
- * 2009 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2009 (c) MontaVista Software, Inc.
  */
 
 #include <linux/clk-provider.h>
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * TI DaVinci DM355 chip specific setup
  *
  * Author: Kevin Hilman, Deep Root Systems, LLC
  *
- * 2007 (c) Deep Root Systems, LLC. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007 (c) Deep Root Systems, LLC.
  */
 
 #include <linux/clk-provider.h>
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * TI DaVinci DM644x chip specific setup
  *
  * Author: Kevin Hilman, Deep Root Systems, LLC
  *
- * 2007 (c) Deep Root Systems, LLC. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007 (c) Deep Root Systems, LLC.
  */
 
 #include <linux/clk-provider.h>
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * TI DaVinci DM644x chip specific setup
  *
  * Author: Kevin Hilman, Deep Root Systems, LLC
  *
- * 2007 (c) Deep Root Systems, LLC. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007 (c) Deep Root Systems, LLC.
  */
 
 #include <linux/clk-provider.h>
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -1,12 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Header for code common to all DaVinci machines.
  *
  * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>
  *
- * 2007 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007 (c) MontaVista Software, Inc.
  */
 
 #ifndef __ARCH_ARM_MACH_DAVINCI_COMMON_H
--- a/arch/arm/mach-davinci/include/mach/cputype.h
+++ b/arch/arm/mach-davinci/include/mach/cputype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * DaVinci CPU type detection
  *
@@ -8,10 +9,7 @@
  * compiled in to the kernel, the macros return 0 so that
  * resulting code can be optimized out.
  *
- * 2009 (c) Deep Root Systems, LLC. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2009 (c) Deep Root Systems, LLC.
  */
 #ifndef _ASM_ARCH_CPU_H
 #define _ASM_ARCH_CPU_H
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -1,12 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Chip specific defines for DA8XX/OMAP L1XX SoC
  *
  * Author: Mark A. Greer <mgreer@mvista.com>
  *
- * 2007, 2009-2010 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007, 2009-2010 (c) MontaVista Software, Inc.
  */
 #ifndef __ASM_ARCH_DAVINCI_DA8XX_H
 #define __ASM_ARCH_DAVINCI_DA8XX_H
--- a/arch/arm/mach-davinci/include/mach/hardware.h
+++ b/arch/arm/mach-davinci/include/mach/hardware.h
@@ -1,12 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Hardware definitions common to all DaVinci family processors
  *
  * Author: Kevin Hilman, Deep Root Systems, LLC
  *
- * 2007 (c) Deep Root Systems, LLC. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007 (c) Deep Root Systems, LLC.
  */
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Table of the DAVINCI register configurations for the PINMUX combinations
  *
@@ -8,10 +9,7 @@
  *
  * Written by Tony Lindgren
  *
- * 2007 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
+ * 2007 (c) MontaVista Software, Inc.
  *
  * Copyright (C) 2008 Texas Instruments.
  */
--- a/arch/arm/mach-davinci/include/mach/serial.h

Re: [ASIS-4 patch 4/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 470

[Enrico Weigelt, metux IT consult]

On 05.06.19 15:18, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
> 
> Based on 1 normalized pattern(s):
> 
>    this file is licensed under the terms of the gnu general public
>    license version 2 this program is licensed as is without any
>    warranty of any kind whether express or implied
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>    GPL-2.0-only
> 
> has been chosen to replace the boilerplate/reference in 586 file(s).
> 
> Bucket: ASIS-4
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> 
> ---
> https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-4&id=9bb438736896
> ---
>   arch/arm/boot/dts/am33xx.dtsi                             |    5 +----
>   arch/arm/boot/dts/am3517.dtsi                             |    5 +----
>   arch/arm/boot/dts/am4372.dtsi                             |    5 +----
>   arch/arm/boot/dts/artpec6-devboard.dts                    |    5 +----
>   arch/arm/boot/dts/dm814x.dtsi                             |    4 +---
>   arch/arm/boot/dts/dm816x.dtsi                             |    4 +---
>   arch/arm/boot/dts/dra62x.dtsi                             |    4 +---
>   arch/arm/boot/dts/dra7-dspeve-thermal.dtsi                |    5 +----
>   arch/arm/boot/dts/dra7-iva-thermal.dtsi                   |    5 +----
>   arch/arm/boot/dts/imx6q-gk802.dts                         |    5 +----
> 
> SNIP
> 
>   arch/powerpc/sysdev/cpm2.c                                |    5 +----
>   arch/powerpc/sysdev/cpm2_pic.c                            |    5 +----
>   arch/powerpc/sysdev/ehv_pic.c                             |    5 +----
>   arch/powerpc/sysdev/ge/ge_pic.c                           |    5 +----
>   arch/powerpc/sysdev/rtc_cmos_setup.c                      |    6 ++----
>   arch/powerpc/sysdev/xilinx_intc.c                         |    6 +-----
>   arch/powerpc/sysdev/xilinx_pci.c                          |    5 +----
>   drivers/ata/ahci_mvebu.c                                  |    5 +----
>   drivers/ata/pata_arasan_cf.c                              |    5 +----
>   drivers/ata/pata_mpc52xx.c                                |    5 +----
>   drivers/bus/imx-weim.c                                    |    5 +----
>   drivers/bus/mvebu-mbus.c                                  |    5 +----
>   drivers/bus/sunxi-rsb.c                                   |    6 +-----
>   drivers/bus/tegra-gmi.c                                   |    5 +----
>   drivers/bus/ts-nbus.c                                     |    5 +----
>   drivers/char/hw_random/amd-rng.c                          |    5 +----
>   drivers/char/hw_random/atmel-rng.c                        |    5 +----
>   drivers/char/hw_random/geode-rng.c                        |    5 +----
> 
> SNIP
> 
>   drivers/watchdog/max63xx_wdt.c                            |    5 +----
>   drivers/watchdog/moxart_wdt.c                             |    5 +----
>   drivers/watchdog/mv64x60_wdt.c                            |    4 +---
>   drivers/watchdog/omap_wdt.c                               |    6 ++----
>   drivers/watchdog/orion_wdt.c                              |    5 +----
>   drivers/watchdog/pnx4008_wdt.c                            |    5 +----
>   drivers/watchdog/sbc_fitpc2_wdt.c                         |    5 +----
>   drivers/watchdog/ts4800_wdt.c                             |    5 +----
>   drivers/watchdog/ts72xx_wdt.c                             |    5 +----
>   include/dt-bindings/leds/leds-netxbig.h                   |    5 +----
>   include/dt-bindings/leds/leds-pca9532.h                   |    5 +----
>   include/dt-bindings/leds/leds-pca955x.h                   |    5 +----
>   include/linux/amba/sp810.h                                |    5 +----
>   include/linux/davinci_emac.h                              |    6 ++----
>   include/linux/dmapool.h                                   |    5 +----
>   include/linux/edac.h                                      |    7 ++-----
>   include/linux/fs_enet_pd.h                                |    5 +----
>   include/linux/fs_uart_pd.h                                |    5 +----
>   include/linux/fsl/bestcomm/ata.h                          |    6 +-----
>   include/linux/fsl/bestcomm/bestcomm.h                     |    6 +-----
>   include/linux/fsl/bestcomm/bestcomm_priv.h                |    5 +----
>   include/linux/fsl/bestcomm/fec.h                          |    6 +-----
>   include/linux/fsl/bestcomm/sram.h                         |    6 +-----
>   include/linux/irqchip.h                                   |    5 +----
>   include/linux/kgdb.h                                      |    4 +---
>   include/linux/mbus.h                                      |    5 +----
>   include/linux/mtd/latch-addr-flash.h                      |    5 +----
>   include/linux/mtd/spear_smi.h                             |    5 +----
>   include/linux/mvebu-pmsu.h                                |    5 +----
>   include/linux/pata_arasan_cf_data.h                       |    5 +----
>   include/linux/platform_data/i2c-davinci.h                 |    6 ++----
>   include/linux/platform_data/keyboard-spear.h              |    5 +----
>   include/linux/platform_data/leds-kirkwood-netxbig.h       |    5 +----
>   include/linux/platform_data/leds-kirkwood-ns2.h           |    5 +----
>   include/linux/platform_data/media/si4713.h                |    6 +-----
>   include/linux/platform_data/mtd-davinci-aemif.h           |    5 +----
>   include/linux/platform_data/mtd-orion_nand.h              |    4 +---
>   include/linux/platform_data/usb-davinci.h                 |    5 +----
>   include/linux/platform_data/usb-ehci-orion.h              |    4 +---
>   include/linux/soc/sunxi/sunxi_sram.h                      |    5 +----
>   include/linux/sunxi-rsb.h                                 |    5 +----
>   include/linux/ts-nbus.h                                   |    5 +----
>   include/video/da8xx-fb.h                                  |    5 +----
>   kernel/debug/debug_core.c                                 |    5 +----
>   kernel/debug/debug_core.h                                 |    5 +----
>   kernel/debug/gdbstub.c                                    |    5 +----
>   kernel/debug/kdb/kdb_debugger.c                           |    5 +----
>   samples/kdb/kdb_hello.c                                   |    5 +----
>   sound/soc/codecs/cs4270.c                                 |    4 +---
>   sound/soc/codecs/cs42xx8-i2c.c                            |    5 +----
>   sound/soc/codecs/cs42xx8.c                                |    5 +----
>   sound/soc/codecs/cs42xx8.h                                |    5 +----
>   sound/soc/codecs/sta529.c                                 |    5 +----
>   sound/soc/dwc/dwc-i2s.c                                   |    5 +----
>   sound/soc/dwc/dwc-pcm.c                                   |    5 +----
>   sound/soc/dwc/local.h                                     |    5 +----
>   sound/soc/fsl/efika-audio-fabric.c                        |    5 +----
>   sound/soc/spear/spdif_in.c                                |    5 +----
>   sound/soc/spear/spdif_out.c                               |    5 +----
>   sound/soc/spear/spear_pcm.c                               |    5 +----
>   586 files changed, 646 insertions(+), 2368 deletions(-)
> 
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for AM33XX SoC
>    *
>    * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/bus/ti-sysc.h>
> --- a/arch/arm/boot/dts/am3517.dtsi
> +++ b/arch/arm/boot/dts/am3517.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for am3517 SoC
>    *
>    * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include "omap3.dtsi"
> --- a/arch/arm/boot/dts/am4372.dtsi
> +++ b/arch/arm/boot/dts/am4372.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for AM4372 SoC
>    *
>    * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/bus/ti-sysc.h>
> --- a/arch/arm/boot/dts/artpec6-devboard.dts
> +++ b/arch/arm/boot/dts/artpec6-devboard.dts
> @@ -1,9 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Axis ARTPEC-6 development board.
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   /dts-v1/;
> --- a/arch/arm/boot/dts/dm814x.dtsi
> +++ b/arch/arm/boot/dts/dm814x.dtsi
> @@ -1,7 +1,5 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/gpio/gpio.h>
> --- a/arch/arm/boot/dts/dm816x.dtsi
> +++ b/arch/arm/boot/dts/dm816x.dtsi
> @@ -1,7 +1,5 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/gpio/gpio.h>
> --- a/arch/arm/boot/dts/dra62x.dtsi
> +++ b/arch/arm/boot/dts/dra62x.dtsi
> @@ -1,7 +1,5 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include "dm814x.dtsi"
> --- a/arch/arm/boot/dts/dra7-dspeve-thermal.dtsi
> +++ b/arch/arm/boot/dts/dra7-dspeve-thermal.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for DRA7x SoC DSPEVE thermal
>    *
>    * Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/thermal/thermal.h>
> --- a/arch/arm/boot/dts/dra7-iva-thermal.dtsi
> +++ b/arch/arm/boot/dts/dra7-iva-thermal.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for DRA7x SoC IVA thermal
>    *
>    * Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/thermal/thermal.h>
> --- a/arch/arm/boot/dts/imx6q-gk802.dts
> +++ b/arch/arm/boot/dts/imx6q-gk802.dts
> @@ -1,9 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Copyright (C) 2013 Philipp Zabel
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   /dts-v1/;
> --- a/arch/arm/boot/dts/omap2.dtsi
> +++ b/arch/arm/boot/dts/omap2.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP2 SoC
>    *
>    * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/gpio/gpio.h>
> --- a/arch/arm/boot/dts/omap2420.dtsi
> +++ b/arch/arm/boot/dts/omap2420.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP2420 SoC
>    *
>    * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include "omap2.dtsi"
> --- a/arch/arm/boot/dts/omap2430.dtsi
> +++ b/arch/arm/boot/dts/omap2430.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP243x SoC
>    *
>    * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include "omap2.dtsi"
> --- a/arch/arm/boot/dts/omap3-cpu-thermal.dtsi
> +++ b/arch/arm/boot/dts/omap3-cpu-thermal.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP3 SoC CPU thermal
>    *
>    * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/thermal/thermal.h>
> --- a/arch/arm/boot/dts/omap3.dtsi
> +++ b/arch/arm/boot/dts/omap3.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP3 SoC
>    *
>    * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/gpio/gpio.h>
> --- a/arch/arm/boot/dts/omap34xx.dtsi
> +++ b/arch/arm/boot/dts/omap34xx.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP34xx/OMAP35xx SoC
>    *
>    * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/bus/ti-sysc.h>
> --- a/arch/arm/boot/dts/omap36xx.dtsi
> +++ b/arch/arm/boot/dts/omap36xx.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP3 SoC
>    *
>    * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/bus/ti-sysc.h>
> --- a/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
> +++ b/arch/arm/boot/dts/omap4-cpu-thermal.dtsi
> @@ -1,12 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP4/5 SoC CPU thermal
>    *
>    * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
>    * Contact: Eduardo Valentin <eduardo.valentin@ti.com>
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/thermal/thermal.h>
> --- a/arch/arm/boot/dts/omap443x.dtsi
> +++ b/arch/arm/boot/dts/omap443x.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP443x SoC
>    *
>    * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include "omap4.dtsi"
> --- a/arch/arm/boot/dts/omap4460.dtsi
> +++ b/arch/arm/boot/dts/omap4460.dtsi
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP4460 SoC
>    *
>    * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   #include "omap4.dtsi"
>   
> --- a/arch/arm/boot/dts/omap5-core-thermal.dtsi
> +++ b/arch/arm/boot/dts/omap5-core-thermal.dtsi
> @@ -1,12 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP543x SoC CORE thermal
>    *
>    * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
>    * Contact: Eduardo Valentin <eduardo.valentin@ti.com>
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/thermal/thermal.h>
> --- a/arch/arm/boot/dts/omap5-gpu-thermal.dtsi
> +++ b/arch/arm/boot/dts/omap5-gpu-thermal.dtsi
> @@ -1,12 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Device Tree Source for OMAP543x SoC GPU thermal
>    *
>    * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
>    * Contact: Eduardo Valentin <eduardo.valentin@ti.com>
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2.  This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   
>   #include <dt-bindings/thermal/thermal.h>
> --- a/arch/arm/boot/dts/orion5x-lacie-d2-network.dts
> +++ b/arch/arm/boot/dts/orion5x-lacie-d2-network.dts
> @@ -1,10 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Copyright (C) 2014 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>    * Copyright (C) 2009 Simon Guinot <sguinot@lacie.com>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   /dts-v1/;
> --- a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
> +++ b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
> @@ -1,9 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Copyright (C) 2012 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   /*
> --- a/arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
> +++ b/arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
> @@ -1,10 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Copyright (C) 2014 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>    * Copyright (C) Sylver Bruneau <sylver.bruneau@googlemail.com>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   /dts-v1/;
> --- a/arch/arm/boot/dts/orion5x-mv88f5181.dtsi
> +++ b/arch/arm/boot/dts/orion5x-mv88f5181.dtsi
> @@ -1,9 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Copyright (C) 2016 Jamie Lentin <jm@lentin.co.uk>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   #include "orion5x.dtsi"
> --- a/arch/arm/boot/dts/orion5x-mv88f5182.dtsi
> +++ b/arch/arm/boot/dts/orion5x-mv88f5182.dtsi
> @@ -1,9 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Copyright (C) 2014 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   #include "orion5x.dtsi"
> --- a/arch/arm/boot/dts/orion5x-netgear-wnr854t.dts
> +++ b/arch/arm/boot/dts/orion5x-netgear-wnr854t.dts
> @@ -1,9 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Copyright (C) 2016 Jamie Lentin <jm@lentin.co.uk>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   /dts-v1/;
> --- a/arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
> +++ b/arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
> @@ -1,9 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Copyright (C) 2014 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   /dts-v1/;
> --- a/arch/arm/boot/dts/orion5x.dtsi
> +++ b/arch/arm/boot/dts/orion5x.dtsi
> @@ -1,9 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Copyright (C) 2012 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
> --- a/arch/arm/include/asm/hardware/cache-feroceon-l2.h
> +++ b/arch/arm/include/asm/hardware/cache-feroceon-l2.h
> @@ -1,11 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * arch/arm/include/asm/hardware/cache-feroceon-l2.h
>    *
>    * Copyright (C) 2008 Marvell Semiconductor
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   extern void __init feroceon_l2_init(int l2_wt_override);
> --- a/arch/arm/include/asm/hardware/cache-tauros2.h
> +++ b/arch/arm/include/asm/hardware/cache-tauros2.h
> @@ -1,11 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * arch/arm/include/asm/hardware/cache-tauros2.h
>    *
>    * Copyright (C) 2008 Marvell Semiconductor
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   #define CACHE_TAUROS2_PREFETCH_ON	(1 << 0)
> --- a/arch/arm/include/asm/hardware/entry-macro-iomd.S
> +++ b/arch/arm/include/asm/hardware/entry-macro-iomd.S
> @@ -1,11 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * arch/arm/include/asm/hardware/entry-macro-iomd.S
>    *
>    * Low-level IRQ helper macros for IOC/IOMD based platforms
> - *
> - * This file is licensed under  the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   /* IOC / IOMD based hardware */
> --- a/arch/arm/mach-davinci/board-da830-evm.c
> +++ b/arch/arm/mach-davinci/board-da830-evm.c
> @@ -1,13 +1,11 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * TI DA830/OMAP L137 EVM board
>    *
>    * Author: Mark A. Greer <mgreer@mvista.com>
>    * Derived from: arch/arm/mach-davinci/board-dm644x-evm.c
>    *
> - * 2007, 2009 (c) MontaVista Software, Inc. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007, 2009 (c) MontaVista Software, Inc.
>    */
>   #include <linux/kernel.h>
>   #include <linux/init.h>
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * TI DA850/OMAP-L138 EVM board
>    *
> @@ -6,10 +7,7 @@
>    * Derived from: arch/arm/mach-davinci/board-da830-evm.c
>    * Original Copyrights follow:
>    *
> - * 2007, 2009 (c) MontaVista Software, Inc. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007, 2009 (c) MontaVista Software, Inc.
>    */
>   #include <linux/console.h>
>   #include <linux/delay.h>
> --- a/arch/arm/mach-davinci/board-dm355-evm.c
> +++ b/arch/arm/mach-davinci/board-dm355-evm.c
> @@ -1,12 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * TI DaVinci EVM board support
>    *
>    * Author: Kevin Hilman, Deep Root Systems, LLC
>    *
> - * 2007 (c) MontaVista Software, Inc. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007 (c) MontaVista Software, Inc.
>    */
>   #include <linux/kernel.h>
>   #include <linux/init.h>
> --- a/arch/arm/mach-davinci/board-dm355-leopard.c
> +++ b/arch/arm/mach-davinci/board-dm355-leopard.c
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * DM355 leopard board support
>    *
>    * Based on board-dm355-evm.c
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   #include <linux/kernel.h>
>   #include <linux/init.h>
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -1,12 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * TI DaVinci EVM board support
>    *
>    * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>
>    *
> - * 2007 (c) MontaVista Software, Inc. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007 (c) MontaVista Software, Inc.
>    */
>   #include <linux/kernel.h>
>   #include <linux/init.h>
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * TI DaVinci DM646X EVM board
>    *
> @@ -5,11 +6,6 @@
>    * Copyright (C) 2006 Texas Instruments.
>    *
>    * (C) 2007-2008, MontaVista Software, Inc.
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2. This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
> - *
>    */
>   
>   /**************************************************************************
> --- a/arch/arm/mach-davinci/board-mityomapl138.c
> +++ b/arch/arm/mach-davinci/board-mityomapl138.c
> @@ -1,11 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Critical Link MityOMAP-L138 SoM
>    *
>    * Copyright (C) 2010 Critical Link LLC - http://www.criticallink.com
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2. This program is licensed "as is" without any warranty of
> - * any kind, whether express or implied.
>    */
>   
>   #define pr_fmt(fmt) "MityOMAPL138: " fmt
> --- a/arch/arm/mach-davinci/board-neuros-osd2.c
> +++ b/arch/arm/mach-davinci/board-neuros-osd2.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Neuros Technologies OSD2 board support
>    *
> @@ -18,10 +19,6 @@
>    *
>    * For more information please refer to
>    * 		http://wiki.neurostechnology.com/index.php/OSD_2.0_HD
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2. This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   #include <linux/platform_device.h>
>   #include <linux/gpio.h>
> --- a/arch/arm/mach-davinci/board-omapl138-hawk.c
> +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Hawkboard.org based on TI's OMAP-L138 Platform
>    *
>    * Initial code: Syed Mohammed Khasim
>    *
>    * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2. This program is licensed "as is" without any warranty of
> - * any kind, whether express or implied.
>    */
>   #include <linux/kernel.h>
>   #include <linux/init.h>
> --- a/arch/arm/mach-davinci/common.c
> +++ b/arch/arm/mach-davinci/common.c
> @@ -1,12 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Code commons to all DaVinci SoCs.
>    *
>    * Author: Mark A. Greer <mgreer@mvista.com>
>    *
> - * 2009 (c) MontaVista Software, Inc. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2009 (c) MontaVista Software, Inc.
>    */
>   #include <linux/module.h>
>   #include <linux/io.h>
> --- a/arch/arm/mach-davinci/cpuidle.h
> +++ b/arch/arm/mach-davinci/cpuidle.h
> @@ -1,11 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * TI DaVinci cpuidle platform support
>    *
>    * 2009 (C) Texas Instruments, Inc. http://www.ti.com/
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2. This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
>    */
>   #ifndef _MACH_DAVINCI_CPUIDLE_H
>   #define _MACH_DAVINCI_CPUIDLE_H
> --- a/arch/arm/mach-davinci/da830.c
> +++ b/arch/arm/mach-davinci/da830.c
> @@ -1,12 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * TI DA830/OMAP L137 chip specific setup
>    *
>    * Author: Mark A. Greer <mgreer@mvista.com>
>    *
> - * 2009 (c) MontaVista Software, Inc. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2009 (c) MontaVista Software, Inc.
>    */
>   #include <linux/clk-provider.h>
>   #include <linux/clk/davinci.h>
> --- a/arch/arm/mach-davinci/da850.c
> +++ b/arch/arm/mach-davinci/da850.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * TI DA850/OMAP-L138 chip specific setup
>    *
> @@ -6,10 +7,7 @@
>    * Derived from: arch/arm/mach-davinci/da830.c
>    * Original Copyrights follow:
>    *
> - * 2009 (c) MontaVista Software, Inc. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2009 (c) MontaVista Software, Inc.
>    */
>   
>   #include <linux/clk-provider.h>
> --- a/arch/arm/mach-davinci/dm355.c
> +++ b/arch/arm/mach-davinci/dm355.c
> @@ -1,12 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * TI DaVinci DM355 chip specific setup
>    *
>    * Author: Kevin Hilman, Deep Root Systems, LLC
>    *
> - * 2007 (c) Deep Root Systems, LLC. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007 (c) Deep Root Systems, LLC.
>    */
>   
>   #include <linux/clk-provider.h>
> --- a/arch/arm/mach-davinci/dm644x.c
> +++ b/arch/arm/mach-davinci/dm644x.c
> @@ -1,12 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * TI DaVinci DM644x chip specific setup
>    *
>    * Author: Kevin Hilman, Deep Root Systems, LLC
>    *
> - * 2007 (c) Deep Root Systems, LLC. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007 (c) Deep Root Systems, LLC.
>    */
>   
>   #include <linux/clk-provider.h>
> --- a/arch/arm/mach-davinci/dm646x.c
> +++ b/arch/arm/mach-davinci/dm646x.c
> @@ -1,12 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * TI DaVinci DM644x chip specific setup
>    *
>    * Author: Kevin Hilman, Deep Root Systems, LLC
>    *
> - * 2007 (c) Deep Root Systems, LLC. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007 (c) Deep Root Systems, LLC.
>    */
>   
>   #include <linux/clk-provider.h>
> --- a/arch/arm/mach-davinci/include/mach/common.h
> +++ b/arch/arm/mach-davinci/include/mach/common.h
> @@ -1,12 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * Header for code common to all DaVinci machines.
>    *
>    * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>
>    *
> - * 2007 (c) MontaVista Software, Inc. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007 (c) MontaVista Software, Inc.
>    */
>   
>   #ifndef __ARCH_ARM_MACH_DAVINCI_COMMON_H
> --- a/arch/arm/mach-davinci/include/mach/cputype.h
> +++ b/arch/arm/mach-davinci/include/mach/cputype.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * DaVinci CPU type detection
>    *
> @@ -8,10 +9,7 @@
>    * compiled in to the kernel, the macros return 0 so that
>    * resulting code can be optimized out.
>    *
> - * 2009 (c) Deep Root Systems, LLC. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2009 (c) Deep Root Systems, LLC.
>    */
>   #ifndef _ASM_ARCH_CPU_H
>   #define _ASM_ARCH_CPU_H
> --- a/arch/arm/mach-davinci/include/mach/da8xx.h
> +++ b/arch/arm/mach-davinci/include/mach/da8xx.h
> @@ -1,12 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * Chip specific defines for DA8XX/OMAP L1XX SoC
>    *
>    * Author: Mark A. Greer <mgreer@mvista.com>
>    *
> - * 2007, 2009-2010 (c) MontaVista Software, Inc. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007, 2009-2010 (c) MontaVista Software, Inc.
>    */
>   #ifndef __ASM_ARCH_DAVINCI_DA8XX_H
>   #define __ASM_ARCH_DAVINCI_DA8XX_H
> --- a/arch/arm/mach-davinci/include/mach/hardware.h
> +++ b/arch/arm/mach-davinci/include/mach/hardware.h
> @@ -1,12 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * Hardware definitions common to all DaVinci family processors
>    *
>    * Author: Kevin Hilman, Deep Root Systems, LLC
>    *
> - * 2007 (c) Deep Root Systems, LLC. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007 (c) Deep Root Systems, LLC.
>    */
>   #ifndef __ASM_ARCH_HARDWARE_H
>   #define __ASM_ARCH_HARDWARE_H
> --- a/arch/arm/mach-davinci/include/mach/mux.h
> +++ b/arch/arm/mach-davinci/include/mach/mux.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
>   /*
>    * Table of the DAVINCI register configurations for the PINMUX combinations
>    *
> @@ -8,10 +9,7 @@
>    *
>    * Written by Tony Lindgren
>    *
> - * 2007 (c) MontaVista Software, Inc. This file is licensed under
> - * the terms of the GNU General Public License version 2. This program
> - * is licensed "as is" without any warranty of any kind, whether express
> - * or implied.
> + * 2007 (c) MontaVista Software, Inc.
>    *
>    * Copyright (C) 2008 Texas Instruments.
>    */
> --- a/arch/arm/mach-davinci/include/mach/serial.h
> 
> 
Reviewed-By: Enrico Weigelt <info@metux.net>

-- 
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
info@metux.net -- +49-151-27565287

Re: [ASIS-4 patch 4/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 470

[Allison Randal]

On 6/5/19 11:18 AM, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
> 
> Based on 1 normalized pattern(s):
> 
>   this file is licensed under the terms of the gnu general public
>   license version 2 this program is licensed as is without any
>   warranty of any kind whether express or implied
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>   GPL-2.0-only
> 
> has been chosen to replace the boilerplate/reference in 586 file(s).
> 
> Bucket: ASIS-4
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Reviewed-by: Allison Randal <allison@lohutok.net>

[ASIS-4 patch 5/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 493

[Thomas Gleixner]

From: Thomas Gleixner tglx@linutronix.de

Based on 1 normalized pattern(s):

  based on gpl ed 2 6 kernel sources [c] [marvell] [international]
  [ltd] this file is licensed under the terms of the gnu general
  public license version 2 this program is licensed as is without any
  warranty of any kind whether express or implied

extracted by the scancode license scanner the SPDX license identifier

  GPL-2.0-only

has been chosen to replace the boilerplate/reference in 1 file(s).

Bucket: ASIS-4

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-4&id=d2e81a656ffb
---
 drivers/irqchip/irq-dw-apb-ictl.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- a/drivers/irqchip/irq-dw-apb-ictl.c
+++ b/drivers/irqchip/irq-dw-apb-ictl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Synopsys DW APB ICTL irqchip driver.
  *
@@ -5,10 +6,6 @@
  *
  * based on GPL'ed 2.6 kernel sources
  *  (c) Marvell International Ltd.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include <linux/io.h>

Re: [ASIS-4 patch 5/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 493

[Enrico Weigelt, metux IT consult]

On 05.06.19 15:18, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
> 
> Based on 1 normalized pattern(s):
> 
>    based on gpl ed 2 6 kernel sources [c] [marvell] [international]
>    [ltd] this file is licensed under the terms of the gnu general
>    public license version 2 this program is licensed as is without any
>    warranty of any kind whether express or implied
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>    GPL-2.0-only
> 
> has been chosen to replace the boilerplate/reference in 1 file(s).
> 
> Bucket: ASIS-4
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> 
> ---
> https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=asis-4&id=d2e81a656ffb
> ---
>   drivers/irqchip/irq-dw-apb-ictl.c |    5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
> 
> --- a/drivers/irqchip/irq-dw-apb-ictl.c
> +++ b/drivers/irqchip/irq-dw-apb-ictl.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>   /*
>    * Synopsys DW APB ICTL irqchip driver.
>    *
> @@ -5,10 +6,6 @@
>    *
>    * based on GPL'ed 2.6 kernel sources
>    *  (c) Marvell International Ltd.
> - *
> - * This file is licensed under the terms of the GNU General Public
> - * License version 2.  This program is licensed "as is" without any
> - * warranty of any kind, whether express or implied.
>    */
>   
>   #include <linux/io.h>
> 
> 
Reviewed-By: Enrico Weigelt <info@metux.net>

-- 
Enrico Weigelt, metux IT consult
Free software and Linux embedded engineering
info@metux.net -- +49-151-27565287

Re: [ASIS-4 patch 5/5] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 493

[Allison Randal]

On 6/5/19 11:18 AM, Thomas Gleixner wrote:
> From: Thomas Gleixner tglx@linutronix.de
> 
> Based on 1 normalized pattern(s):
> 
>   based on gpl ed 2 6 kernel sources [c] [marvell] [international]
>   [ltd] this file is licensed under the terms of the gnu general
>   public license version 2 this program is licensed as is without any
>   warranty of any kind whether express or implied
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>   GPL-2.0-only
> 
> has been chosen to replace the boilerplate/reference in 1 file(s).
> 
> Bucket: ASIS-4
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Reviewed-by: Allison Randal <allison@lohutok.net>

Re: [ASIS-4 patch 0/5] Deep review of 'AS IS' disclaimers - part 4

[Allison Randal]

On 6/5/19 11:18 AM, Thomas Gleixner wrote:
> This is the forth variant of disclaimer modifications.
> 
> Standard disclaimer:
> 
>     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
> 
> Modified disclaimer:
> 
>     the/this program is licensed as is without any warranty of any kind whether
>     express or implied
> 
> As with the previous 3, I don't see anything contradicting or substantially
> different.

The added wording "as is", "of any kind", and "express or implied" was
all copied directly from GPLv2, and so doesn't add any additional
disclaimers.

Allison