Reviewed-by: Steve Winslow <swinslow@xxxxxxxxx> On Tue, May 28, 2019 at 1:16 PM Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote: > > From: Thomas Gleixner tglx@xxxxxxxxxxxxx > > Based on 1 normalized pattern(s): > > licensed under gplv2 > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-only > > has been chosen to replace the boilerplate/reference in 99 file(s). > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch9&id=97a46a72c47e > --- > arch/arm/boot/dts/at91-qil_a9260.dts | 3 +-- > arch/arm/boot/dts/at91sam9g15.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9g20.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9g20ek.dts | 3 +-- > arch/arm/boot/dts/at91sam9g20ek_2mmc.dts | 3 +-- > arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9g25.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9g35.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9x25.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9x35.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9x5_can.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9x5_isi.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9x5_lcd.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9x5_macb0.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9x5_macb1.dtsi | 3 +-- > arch/arm/boot/dts/at91sam9x5_usart3.dtsi | 3 +-- > arch/arm/boot/dts/da850-lcdk.dts | 3 +-- > arch/arm/boot/dts/ethernut5.dts | 3 +-- > arch/arm/boot/dts/pm9g45.dts | 3 +-- > arch/arm/boot/dts/sama5d3_can.dtsi | 3 +-- > arch/arm/boot/dts/sama5d3_emac.dtsi | 3 +-- > arch/arm/boot/dts/sama5d3_gmac.dtsi | 3 +-- > arch/arm/boot/dts/sama5d3_lcd.dtsi | 3 +-- > arch/arm/boot/dts/sama5d3_mci2.dtsi | 3 +-- > arch/arm/boot/dts/sama5d3_tcb1.dtsi | 3 +-- > arch/arm/boot/dts/sama5d3_uart.dtsi | 3 +-- > arch/arm/boot/dts/tny_a9260.dts | 3 +-- > arch/arm/boot/dts/tny_a9260_common.dtsi | 3 +-- > arch/arm/boot/dts/tny_a9g20.dts | 3 +-- > arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi | 3 +-- > arch/powerpc/kernel/dt_cpu_ftrs.c | 2 +- > drivers/firmware/dmi-id.c | 3 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 3 +-- > drivers/gpu/drm/radeon/radeon_atpx_handler.c | 3 +-- > drivers/pwm/pwm-atmel.c | 3 +-- > drivers/pwm/pwm-sun4i.c | 3 +-- > drivers/watchdog/atlas7_wdt.c | 3 +-- > drivers/watchdog/sama5d4_wdt.c | 3 +-- > fs/proc/consoles.c | 3 +-- > include/linux/mfd/abx500/ab8500-bm.h | 2 +- > include/linux/mfd/abx500/ab8500-gpadc.h | 2 +- > tools/testing/selftests/powerpc/benchmarks/futex_bench.c | 2 +- > tools/testing/selftests/powerpc/benchmarks/gettimeofday.c | 2 +- > tools/testing/selftests/powerpc/benchmarks/mmap_bench.c | 2 +- > tools/testing/selftests/powerpc/harness.c | 2 +- > tools/testing/selftests/powerpc/include/reg.h | 2 +- > tools/testing/selftests/powerpc/include/subunit.h | 2 +- > tools/testing/selftests/powerpc/include/utils.h | 2 +- > tools/testing/selftests/powerpc/mm/prot_sao.c | 2 +- > tools/testing/selftests/powerpc/pmu/count_instructions.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/busy_loop.S | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/close_clears_pmcc_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/cpu_event_vs_ebb_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/ebb.h | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/ebb_handler.S | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/ebb_on_child_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/ebb_vs_cpu_event_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/event_attributes_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/fixed_instruction_loop.S | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/fork_cleanup_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/instruction_count_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/reg_access_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/task_event_pinned_vs_ebb_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/task_event_vs_ebb_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/trace.c | 2 +- > tools/testing/selftests/powerpc/pmu/ebb/trace.h | 2 +- > tools/testing/selftests/powerpc/pmu/event.c | 2 +- > tools/testing/selftests/powerpc/pmu/event.h | 2 +- > tools/testing/selftests/powerpc/pmu/l3_bank_test.c | 2 +- > tools/testing/selftests/powerpc/pmu/lib.c | 2 +- > tools/testing/selftests/powerpc/pmu/lib.h | 2 +- > tools/testing/selftests/powerpc/pmu/loop.S | 2 +- > tools/testing/selftests/powerpc/pmu/per_event_excludes.c | 2 +- > tools/testing/selftests/powerpc/tm/tm-fork.c | 2 +- > tools/testing/selftests/powerpc/tm/tm-signal-msr-resv.c | 2 +- > tools/testing/selftests/powerpc/tm/tm-signal-stack.c | 2 +- > tools/testing/selftests/powerpc/tm/tm-syscall.c | 2 +- > tools/testing/selftests/powerpc/tm/tm-tar.c | 2 +- > tools/testing/selftests/powerpc/tm/tm-tmspr.c | 3 +-- > tools/testing/selftests/powerpc/tm/tm-trap.c | 2 +- > tools/testing/selftests/powerpc/tm/tm-unavailable.c | 2 +- > tools/testing/selftests/powerpc/tm/tm-vmx-unavail.c | 2 +- > tools/testing/selftests/powerpc/tm/tm-vmxcopy.c | 2 +- > tools/testing/selftests/powerpc/tm/tm.h | 2 +- > tools/testing/selftests/powerpc/utils.c | 2 +- > tools/testing/selftests/vm/virtual_address_range.c | 2 +- > 99 files changed, 99 insertions(+), 138 deletions(-) > > --- a/arch/arm/boot/dts/at91-qil_a9260.dts > +++ b/arch/arm/boot/dts/at91-qil_a9260.dts > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91-qil_a9260.dts - Device Tree file for Calao QIL A9260 board > * > * Copyright (C) 2011-2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > /dts-v1/; > #include "at91sam9260.dtsi" > --- a/arch/arm/boot/dts/at91sam9g15.dtsi > +++ b/arch/arm/boot/dts/at91sam9g15.dtsi > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9g15.dtsi - Device Tree Include file for AT91SAM9G15 SoC > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include "at91sam9x5.dtsi" > --- a/arch/arm/boot/dts/at91sam9g20.dtsi > +++ b/arch/arm/boot/dts/at91sam9g20.dtsi > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9g20.dtsi - Device Tree Include file for AT91SAM9G20 family SoC > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include "at91sam9260.dtsi" > --- a/arch/arm/boot/dts/at91sam9g20ek.dts > +++ b/arch/arm/boot/dts/at91sam9g20ek.dts > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9g20ek.dts - Device Tree file for Atmel at91sam9g20ek board > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > /dts-v1/; > #include "at91sam9g20ek_common.dtsi" > --- a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts > +++ b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9g20ek_2mmc.dts - Device Tree file for Atmel at91sam9g20ek 2 MMC board > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > /dts-v1/; > #include "at91sam9g20ek_common.dtsi" > --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi > +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9g20ek_common.dtsi - Device Tree file for Atmel at91sam9g20ek board > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > #include "at91sam9g20.dtsi" > > --- a/arch/arm/boot/dts/at91sam9g25.dtsi > +++ b/arch/arm/boot/dts/at91sam9g25.dtsi > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9g25.dtsi - Device Tree Include file for AT91SAM9G25 SoC > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include "at91sam9x5.dtsi" > --- a/arch/arm/boot/dts/at91sam9g35.dtsi > +++ b/arch/arm/boot/dts/at91sam9g35.dtsi > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9g35.dtsi - Device Tree Include file for AT91SAM9G35 SoC > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include "at91sam9x5.dtsi" > --- a/arch/arm/boot/dts/at91sam9x25.dtsi > +++ b/arch/arm/boot/dts/at91sam9x25.dtsi > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9x25.dtsi - Device Tree Include file for AT91SAM9X25 SoC > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include "at91sam9x5.dtsi" > --- a/arch/arm/boot/dts/at91sam9x35.dtsi > +++ b/arch/arm/boot/dts/at91sam9x35.dtsi > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9x35.dtsi - Device Tree Include file for AT91SAM9X35 SoC > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include "at91sam9x5.dtsi" > --- a/arch/arm/boot/dts/at91sam9x5_can.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5_can.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9x5_can.dtsi - Device Tree Include file for AT91SAM9x5 SoC with 1 > * Ethernet interface. > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/at91sam9x5_isi.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5_isi.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9x5_isi.dtsi - Device Tree Include file for AT91SAM9x5 SoC with an > * Image Sensor Interface. > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/at91sam9x5_lcd.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5_lcd.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9x5_lcd.dtsi - Device Tree Include file for AT91SAM9x5 SoC with an > * LCD controller. > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/at91sam9x5_macb0.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5_macb0.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9x5_macb0.dtsi - Device Tree Include file for AT91SAM9x5 SoC with 1 > * Ethernet interface. > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/at91sam9x5_macb1.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5_macb1.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9x5_macb1.dtsi - Device Tree Include file for AT91SAM9x5 SoC with 2 > * Ethernet interfaces. > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/at91sam9x5_usart3.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5_usart3.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * at91sam9x5_usart3.dtsi - Device Tree Include file for AT91SAM9x5 SoC with > * 4 USART. > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/da850-lcdk.dts > +++ b/arch/arm/boot/dts/da850-lcdk.dts > @@ -1,7 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2016 BayLibre, Inc. > - * > - * Licensed under GPLv2. > */ > /dts-v1/; > #include "da850.dtsi" > --- a/arch/arm/boot/dts/ethernut5.dts > +++ b/arch/arm/boot/dts/ethernut5.dts > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * ethernut5.dts - Device Tree file for Ethernut 5 board > * > * Copyright (C) 2012 egnite GmbH <info@xxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > /dts-v1/; > #include "at91sam9xe.dtsi" > --- a/arch/arm/boot/dts/pm9g45.dts > +++ b/arch/arm/boot/dts/pm9g45.dts > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * pm9g45.dts - Device Tree file for Ronetix pm9g45 board > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > /dts-v1/; > #include "at91sam9g45.dtsi" > --- a/arch/arm/boot/dts/sama5d3_can.dtsi > +++ b/arch/arm/boot/dts/sama5d3_can.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * sama5d3_can.dtsi - Device Tree Include file for SAMA5D3 SoC with > * CAN support > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/sama5d3_emac.dtsi > +++ b/arch/arm/boot/dts/sama5d3_emac.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * sama5d3_emac.dtsi - Device Tree Include file for SAMA5D3 SoC with > * Ethernet. > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/sama5d3_gmac.dtsi > +++ b/arch/arm/boot/dts/sama5d3_gmac.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * sama5d3_gmac.dtsi - Device Tree Include file for SAMA5D3 SoC with > * Gigabit Ethernet. > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/sama5d3_lcd.dtsi > +++ b/arch/arm/boot/dts/sama5d3_lcd.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * sama5d3_lcd.dtsi - Device Tree Include file for SAMA5D3 SoC with > * LCD support > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/sama5d3_mci2.dtsi > +++ b/arch/arm/boot/dts/sama5d3_mci2.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * sama5d3_mci2.dtsi - Device Tree Include file for SAMA5D3 SoC with > * 3 MMC ports > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/sama5d3_tcb1.dtsi > +++ b/arch/arm/boot/dts/sama5d3_tcb1.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * sama5d3_tcb1.dtsi - Device Tree Include file for SAMA5D3 SoC with > * 2 TC blocks. > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/sama5d3_uart.dtsi > +++ b/arch/arm/boot/dts/sama5d3_uart.dtsi > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * sama5d3_uart.dtsi - Device Tree Include file for SAMA5D3 SoC with > * UART support > * > * Copyright (C) 2013 Boris BREZILLON <b.brezillon@xxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <dt-bindings/pinctrl/at91.h> > --- a/arch/arm/boot/dts/tny_a9260.dts > +++ b/arch/arm/boot/dts/tny_a9260.dts > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * tny_a9260.dts - Device Tree file for Caloa TNY A9260 board > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > /dts-v1/; > #include "at91sam9260.dtsi" > --- a/arch/arm/boot/dts/tny_a9260_common.dtsi > +++ b/arch/arm/boot/dts/tny_a9260_common.dtsi > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * tny_a9260_common.dtsi - Device Tree file for Caloa TNY A926x board > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > / { > --- a/arch/arm/boot/dts/tny_a9g20.dts > +++ b/arch/arm/boot/dts/tny_a9g20.dts > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * tny_a9g20.dts - Device Tree file for Caloa TNY A9G20 board > * > * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > /dts-v1/; > #include "at91sam9g20.dtsi" > --- a/arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi > +++ b/arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * calao-dab-mmx.dtsi - Device Tree Include file for Calao DAB-MMX Daughter Board > * > * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > / { > --- a/arch/powerpc/kernel/dt_cpu_ftrs.c > +++ b/arch/powerpc/kernel/dt_cpu_ftrs.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2017, Nicholas Piggin, IBM Corporation > - * Licensed under GPLv2. > */ > > #define pr_fmt(fmt) "dt-cpu-ftrs: " fmt > --- a/drivers/firmware/dmi-id.c > +++ b/drivers/firmware/dmi-id.c > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Export SMBIOS/DMI info via sysfs to userspace > * > * Copyright 2007, Lennart Poettering > - * > - * Licensed under GPLv2 > */ > > #include <linux/module.h> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2010 Red Hat Inc. > * Author : Dave Airlie <airlied@xxxxxxxxxx> > * > - * Licensed under GPLv2 > - * > * ATPX support for both Intel/ATI > */ > #include <linux/vga_switcheroo.h> > --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c > +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2010 Red Hat Inc. > * Author : Dave Airlie <airlied@xxxxxxxxxx> > * > - * Licensed under GPLv2 > - * > * ATPX support for both Intel/ATI > */ > #include <linux/vga_switcheroo.h> > --- a/drivers/pwm/pwm-atmel.c > +++ b/drivers/pwm/pwm-atmel.c > @@ -1,10 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Driver for Atmel Pulse Width Modulation Controller > * > * Copyright (C) 2013 Atmel Corporation > * Bo Shen <voice.shen@xxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <linux/clk.h> > --- a/drivers/pwm/pwm-sun4i.c > +++ b/drivers/pwm/pwm-sun4i.c > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Driver for Allwinner sun4i Pulse Width Modulation Controller > * > * Copyright (C) 2014 Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx> > - * > - * Licensed under GPLv2. > */ > > #include <linux/bitops.h> > --- a/drivers/watchdog/atlas7_wdt.c > +++ b/drivers/watchdog/atlas7_wdt.c > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Watchdog driver for CSR Atlas7 > * > * Copyright (c) 2015 Cambridge Silicon Radio Limited, a CSR plc group company. > - * > - * Licensed under GPLv2. > */ > > #include <linux/clk.h> > --- a/drivers/watchdog/sama5d4_wdt.c > +++ b/drivers/watchdog/sama5d4_wdt.c > @@ -1,9 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Driver for Atmel SAMA5D4 Watchdog Timer > * > * Copyright (C) 2015 Atmel Corporation > - * > - * Licensed under GPLv2. > */ > > #include <linux/delay.h> > --- a/fs/proc/consoles.c > +++ b/fs/proc/consoles.c > @@ -1,7 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2010 Werner Fink, Jiri Slaby > - * > - * Licensed under GPLv2 > */ > > #include <linux/console.h> > --- a/include/linux/mfd/abx500/ab8500-bm.h > +++ b/include/linux/mfd/abx500/ab8500-bm.h > @@ -1,8 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright ST-Ericsson 2012. > * > * Author: Arun Murthy <arun.murthy@xxxxxxxxxxxxxx> > - * Licensed under GPLv2. > */ > > #ifndef _AB8500_BM_H > --- a/include/linux/mfd/abx500/ab8500-gpadc.h > +++ b/include/linux/mfd/abx500/ab8500-gpadc.h > @@ -1,6 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2010 ST-Ericsson SA > - * Licensed under GPLv2. > * > * Author: Arun R Murthy <arun.murthy@xxxxxxxxxxxxxx> > * Author: Daniel Willerud <daniel.willerud@xxxxxxxxxxxxxx> > --- a/tools/testing/selftests/powerpc/benchmarks/futex_bench.c > +++ b/tools/testing/selftests/powerpc/benchmarks/futex_bench.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2016, Anton Blanchard, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #define _GNU_SOURCE > --- a/tools/testing/selftests/powerpc/benchmarks/gettimeofday.c > +++ b/tools/testing/selftests/powerpc/benchmarks/gettimeofday.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2015, Anton Blanchard, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <sys/time.h> > --- a/tools/testing/selftests/powerpc/benchmarks/mmap_bench.c > +++ b/tools/testing/selftests/powerpc/benchmarks/mmap_bench.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2016, Anton Blanchard, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/harness.c > +++ b/tools/testing/selftests/powerpc/harness.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2013, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <errno.h> > --- a/tools/testing/selftests/powerpc/include/reg.h > +++ b/tools/testing/selftests/powerpc/include/reg.h > @@ -1,6 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #ifndef _SELFTESTS_POWERPC_REG_H > --- a/tools/testing/selftests/powerpc/include/subunit.h > +++ b/tools/testing/selftests/powerpc/include/subunit.h > @@ -1,6 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright 2013, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #ifndef _SELFTESTS_POWERPC_SUBUNIT_H > --- a/tools/testing/selftests/powerpc/include/utils.h > +++ b/tools/testing/selftests/powerpc/include/utils.h > @@ -1,6 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright 2013, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #ifndef _SELFTESTS_POWERPC_UTILS_H > --- a/tools/testing/selftests/powerpc/mm/prot_sao.c > +++ b/tools/testing/selftests/powerpc/mm/prot_sao.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2016, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/pmu/count_instructions.c > +++ b/tools/testing/selftests/powerpc/pmu/count_instructions.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2013, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #define _GNU_SOURCE > --- a/tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdbool.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/busy_loop.S > +++ b/tools/testing/selftests/powerpc/pmu/ebb/busy_loop.S > @@ -1,6 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <ppc-asm.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/close_clears_pmcc_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/close_clears_pmcc_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <signal.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_vs_ebb_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_vs_ebb_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <signal.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/ebb.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #define _GNU_SOURCE /* For CPU_ZERO etc. */ > --- a/tools/testing/selftests/powerpc/pmu/ebb/ebb.h > +++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb.h > @@ -1,6 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #ifndef _SELFTESTS_POWERPC_PMU_EBB_EBB_H > --- a/tools/testing/selftests/powerpc/pmu/ebb/ebb_handler.S > +++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb_handler.S > @@ -1,6 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <ppc-asm.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_child_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_child_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <signal.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <signal.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/ebb_vs_cpu_event_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb_vs_cpu_event_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <signal.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/event_attributes_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/event_attributes_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/fixed_instruction_loop.S > +++ b/tools/testing/selftests/powerpc/pmu/ebb/fixed_instruction_loop.S > @@ -1,6 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <ppc-asm.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/fork_cleanup_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/fork_cleanup_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <signal.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/instruction_count_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/instruction_count_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #define _GNU_SOURCE > --- a/tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <sched.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdbool.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <sched.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/reg_access_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/reg_access_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <stdio.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/task_event_pinned_vs_ebb_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/task_event_pinned_vs_ebb_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <signal.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/task_event_vs_ebb_test.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/task_event_vs_ebb_test.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <signal.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/trace.c > +++ b/tools/testing/selftests/powerpc/pmu/ebb/trace.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #include <errno.h> > --- a/tools/testing/selftests/powerpc/pmu/ebb/trace.h > +++ b/tools/testing/selftests/powerpc/pmu/ebb/trace.h > @@ -1,6 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright 2014, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #ifndef _SELFTESTS_POWERPC_PMU_EBB_TRACE_H > --- a/tools/testing/selftests/powerpc/pmu/event.c > +++ b/tools/testing/selftests/powerpc/pmu/event.c > @@ -1,6 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright 2013, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #define _GNU_SOURCE > --- a/tools/testing/selftests/powerpc/pmu/event.h > +++ b/tools/testing/selftests/powerpc/pmu/event.h > @@ -1,6 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright 2013, Michael Ellerman, IBM Corp. > - * Licensed under GPLv2. > */ > > #ifndef _SELFTESTS_POWERPC_PMU_EVENT_H > --- a/tools/testing/selftests/powerpc/pmu/l3_bank_test.c > > -- Steve Winslow Director of Strategic Programs The Linux Foundation swinslow@xxxxxxxxxxxxxxxxxxx