Reviewed-by: Steve Winslow <swinslow@xxxxxxxxx> On Tue, May 28, 2019 at 1:17 PM Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote: > > From: Thomas Gleixner tglx@xxxxxxxxxxxxx > > Based on 1 normalized pattern(s): > > this program is free software you can redistribute it and or modify > it under the terms of version 2 of the gnu general public license as > published by the free software foundation > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-only > > has been chosen to replace the boilerplate/reference in 107 file(s). > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch10&id=0d96c98da90b > --- > arch/ia64/include/asm/uncached.h | 5 +---- > arch/ia64/kernel/uncached.c | 5 +---- > arch/powerpc/platforms/powernv/npu-dma.c | 5 +---- > arch/powerpc/sysdev/cpm_common.c | 5 +---- > arch/x86/include/asm/geode.h | 5 +---- > drivers/char/mspec.c | 5 +---- > drivers/clocksource/timer-cs5535.c | 5 +---- > drivers/crypto/cavium/cpt/cpt_common.h | 5 +---- > drivers/crypto/cavium/cpt/cpt_hw_types.h | 5 +---- > drivers/crypto/cavium/cpt/cptpf.h | 5 +---- > drivers/crypto/cavium/cpt/cptpf_main.c | 5 +---- > drivers/crypto/cavium/cpt/cptpf_mbox.c | 5 +---- > drivers/crypto/cavium/cpt/cptvf.h | 5 +---- > drivers/crypto/cavium/cpt/cptvf_algs.c | 5 +---- > drivers/crypto/cavium/cpt/cptvf_algs.h | 5 +---- > drivers/crypto/cavium/cpt/cptvf_main.c | 5 +---- > drivers/crypto/cavium/cpt/cptvf_mbox.c | 5 +---- > drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 5 +---- > drivers/crypto/cavium/cpt/request_manager.h | 5 +---- > drivers/crypto/ixp4xx_crypto.c | 6 +----- > drivers/gpio/gpio-cs5535.c | 5 +---- > drivers/media/pci/tw686x/tw686x-audio.c | 5 +---- > drivers/media/pci/tw686x/tw686x-core.c | 5 +---- > drivers/media/pci/tw686x/tw686x-video.c | 6 +----- > drivers/media/pci/tw686x/tw686x.h | 5 +---- > drivers/media/v4l2-core/v4l2-fwnode.c | 5 +---- > drivers/misc/cs5535-mfgpt.c | 5 +---- > drivers/net/ethernet/cavium/thunder/nic.h | 5 +---- > drivers/net/ethernet/cavium/thunder/nic_main.c | 5 +---- > drivers/net/ethernet/cavium/thunder/nic_reg.h | 5 +---- > drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c | 5 +---- > drivers/net/ethernet/cavium/thunder/nicvf_main.c | 5 +---- > drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 5 +---- > drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 5 +---- > drivers/net/ethernet/cavium/thunder/q_struct.h | 5 +---- > drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 5 +---- > drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 5 +---- > drivers/net/ethernet/cavium/thunder/thunder_xcv.c | 5 +---- > drivers/net/ethernet/xscale/ixp4xx_eth.c | 6 +----- > drivers/net/wan/c101.c | 5 +---- > drivers/net/wan/hd64570.c | 5 +---- > drivers/net/wan/hd64572.c | 5 +---- > drivers/net/wan/hdlc.c | 5 +---- > drivers/net/wan/hdlc_cisco.c | 5 +---- > drivers/net/wan/hdlc_fr.c | 5 +---- > drivers/net/wan/hdlc_ppp.c | 5 +---- > drivers/net/wan/hdlc_raw.c | 5 +---- > drivers/net/wan/hdlc_raw_eth.c | 5 +---- > drivers/net/wan/hdlc_x25.c | 5 +---- > drivers/net/wan/ixp4xx_hss.c | 5 +---- > drivers/net/wan/n2.c | 5 +---- > drivers/net/wan/pc300too.c | 5 +---- > drivers/net/wan/pci200syn.c | 5 +---- > drivers/net/wan/wanxl.c | 5 +---- > drivers/net/wan/wanxl.h | 5 +---- > drivers/net/wan/wanxlfw.S | 4 +--- > drivers/scsi/be2iscsi/be_iscsi.c | 6 +----- > drivers/soc/fsl/qe/qe_common.c | 5 +---- > drivers/soc/ixp4xx/ixp4xx-qmgr.c | 5 +---- > drivers/watchdog/intel-mid_wdt.c | 5 +---- > include/dt-bindings/dma/nbpfaxi.h | 5 +---- > include/linux/bpf.h | 5 +---- > include/linux/bpf_verifier.h | 5 +---- > include/linux/cs5535.h | 5 +---- > include/linux/hdlc.h | 5 +---- > include/linux/platform_data/intel-mid_wdt.h | 5 +---- > include/linux/soc/ixp4xx/qmgr.h | 5 +---- > include/media/v4l2-fwnode.h | 5 +---- > kernel/bpf/bpf_lru_list.c | 5 +---- > kernel/bpf/bpf_lru_list.h | 5 +---- > kernel/bpf/map_in_map.c | 5 +---- > kernel/bpf/map_in_map.h | 5 +---- > kernel/bpf/percpu_freelist.c | 5 +---- > kernel/bpf/percpu_freelist.h | 5 +---- > kernel/bpf/stackmap.c | 5 +---- > net/bpf/test_run.c | 5 +---- > net/openvswitch/meter.c | 5 +---- > net/openvswitch/meter.h | 5 +---- > samples/bpf/lathist_user.c | 5 +---- > samples/bpf/map_perf_test_user.c | 5 +---- > samples/bpf/offwaketime_user.c | 5 +---- > samples/bpf/sampleip_user.c | 5 +---- > samples/bpf/syscall_tp_kern.c | 5 +---- > samples/bpf/syscall_tp_user.c | 5 +---- > samples/bpf/tc_l2_redirect_user.c | 5 +---- > samples/bpf/test_cgrp2_array_pin.c | 5 +---- > samples/bpf/test_current_task_under_cgroup_user.c | 5 +---- > samples/bpf/test_lru_dist.c | 5 +---- > samples/bpf/test_map_in_map_user.c | 5 +---- > samples/bpf/test_overhead_user.c | 5 +---- > samples/bpf/trace_event_user.c | 5 +---- > samples/bpf/trace_output_user.c | 5 +---- > samples/bpf/tracex3_user.c | 5 +---- > samples/bpf/tracex4_user.c | 5 +---- > samples/bpf/xdp1_user.c | 5 +---- > samples/bpf/xdp_router_ipv4_user.c | 5 +---- > samples/bpf/xdp_tx_iptunnel_common.h | 5 +---- > samples/bpf/xdp_tx_iptunnel_user.c | 5 +---- > tools/testing/selftests/bpf/progs/test_obj_id.c | 5 +---- > tools/testing/selftests/bpf/progs/test_pkt_access.c | 5 +---- > tools/testing/selftests/bpf/progs/test_pkt_md_access.c | 5 +---- > tools/testing/selftests/bpf/test_dev_cgroup.c | 5 +---- > tools/testing/selftests/bpf/test_iptunnel_common.h | 5 +---- > tools/testing/selftests/bpf/test_lru_map.c | 5 +---- > tools/testing/selftests/bpf/test_maps.c | 5 +---- > tools/testing/selftests/bpf/test_progs.c | 5 +---- > tools/testing/selftests/bpf/test_verifier.c | 5 +---- > 107 files changed, 107 insertions(+), 431 deletions(-) > > --- a/arch/ia64/include/asm/uncached.h > +++ b/arch/ia64/include/asm/uncached.h > @@ -1,10 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2001-2008 Silicon Graphics, Inc. All rights reserved. > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * Prototypes for the uncached page allocator > */ > > --- a/arch/ia64/kernel/uncached.c > +++ b/arch/ia64/kernel/uncached.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2001-2008 Silicon Graphics, Inc. All rights reserved. > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * A simple uncached page allocator using the generic allocator. This > * allocator first utilizes the spare (spill) pages found in the EFI > * memmap and will then start converting cached pages to uncached ones > --- a/arch/powerpc/platforms/powernv/npu-dma.c > +++ b/arch/powerpc/platforms/powernv/npu-dma.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * This file implements the DMA operations for NVLink devices. The NPU > * devices all point to the same iommu table as the parent PCI device. > * > * Copyright Alistair Popple, IBM Corporation 2015. > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of version 2 of the GNU General Public > - * License as published by the Free Software Foundation. > */ > > #include <linux/mmu_notifier.h> > --- a/arch/powerpc/sysdev/cpm_common.c > +++ b/arch/powerpc/sysdev/cpm_common.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Common CPM code > * > @@ -11,10 +12,6 @@ > * Copyright (c) 2000 MontaVista Software, Inc (source@xxxxxxxxxx) > * 2006 (c) MontaVista Software, Inc. > * Vitaly Bordug <vbordug@xxxxxxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of version 2 of the GNU General Public License as > - * published by the Free Software Foundation. > */ > > #include <linux/init.h> > --- a/arch/x86/include/asm/geode.h > +++ b/arch/x86/include/asm/geode.h > @@ -1,10 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * AMD Geode definitions > * Copyright (C) 2006, Advanced Micro Devices, Inc. > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef _ASM_X86_GEODE_H > --- a/drivers/char/mspec.c > +++ b/drivers/char/mspec.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2001-2006 Silicon Graphics, Inc. All rights > * reserved. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > /* > --- a/drivers/clocksource/timer-cs5535.c > +++ b/drivers/clocksource/timer-cs5535.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Clock event driver for the CS5535/CS5536 > * > @@ -5,10 +6,6 @@ > * Copyright (C) 2007 Andres Salomon <dilinger@xxxxxxxxxx> > * Copyright (C) 2009 Andres Salomon <dilinger@xxxxxxxxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * The MFGPTs are documented in AMD Geode CS5536 Companion Device Data Book. > */ > > --- a/drivers/crypto/cavium/cpt/cpt_common.h > +++ b/drivers/crypto/cavium/cpt/cpt_common.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef __CPT_COMMON_H > --- a/drivers/crypto/cavium/cpt/cpt_hw_types.h > +++ b/drivers/crypto/cavium/cpt/cpt_hw_types.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef __CPT_HW_TYPES_H > --- a/drivers/crypto/cavium/cpt/cptpf.h > +++ b/drivers/crypto/cavium/cpt/cptpf.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef __CPTPF_H > --- a/drivers/crypto/cavium/cpt/cptpf_main.c > +++ b/drivers/crypto/cavium/cpt/cptpf_main.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/device.h> > --- a/drivers/crypto/cavium/cpt/cptpf_mbox.c > +++ b/drivers/crypto/cavium/cpt/cptpf_mbox.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > #include <linux/module.h> > #include "cptpf.h" > --- a/drivers/crypto/cavium/cpt/cptvf.h > +++ b/drivers/crypto/cavium/cpt/cptvf.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef __CPTVF_H > --- a/drivers/crypto/cavium/cpt/cptvf_algs.c > +++ b/drivers/crypto/cavium/cpt/cptvf_algs.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <crypto/aes.h> > --- a/drivers/crypto/cavium/cpt/cptvf_algs.h > +++ b/drivers/crypto/cavium/cpt/cptvf_algs.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef _CPTVF_ALGS_H_ > --- a/drivers/crypto/cavium/cpt/cptvf_main.c > +++ b/drivers/crypto/cavium/cpt/cptvf_main.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/interrupt.h> > --- a/drivers/crypto/cavium/cpt/cptvf_mbox.c > +++ b/drivers/crypto/cavium/cpt/cptvf_mbox.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include "cptvf.h" > --- a/drivers/crypto/cavium/cpt/cptvf_reqmanager.c > +++ b/drivers/crypto/cavium/cpt/cptvf_reqmanager.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include "cptvf.h" > --- a/drivers/crypto/cavium/cpt/request_manager.h > +++ b/drivers/crypto/cavium/cpt/request_manager.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef __REQUEST_MANAGER_H > --- a/drivers/crypto/ixp4xx_crypto.c > +++ b/drivers/crypto/ixp4xx_crypto.c > @@ -1,12 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Intel IXP4xx NPE-C crypto driver > * > * Copyright (C) 2008 Christian Hohnstaedt <chohnstaedt@xxxxxxxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > */ > > #include <linux/platform_device.h> > --- a/drivers/gpio/gpio-cs5535.c > +++ b/drivers/gpio/gpio-cs5535.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * AMD CS5535/CS5536 GPIO driver > * Copyright (C) 2006 Advanced Micro Devices, Inc. > * Copyright (C) 2007-2009 Andres Salomon <dilinger@xxxxxxxxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/kernel.h> > --- a/drivers/media/pci/tw686x/tw686x-audio.c > +++ b/drivers/media/pci/tw686x/tw686x-audio.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2015 VanguardiaSur - www.vanguardiasur.com.ar > * > @@ -7,10 +8,6 @@ > * Based on: > * Driver for Intersil|Techwell TW6869 based DVR cards > * (c) 2011-12 liran <jli11@xxxxxxxxxxxx> [Intersil|Techwell China] > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/types.h> > --- a/drivers/media/pci/tw686x/tw686x-core.c > +++ b/drivers/media/pci/tw686x/tw686x-core.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2015 VanguardiaSur - www.vanguardiasur.com.ar > * > @@ -5,10 +6,6 @@ > * Copyright (C) 2015 Industrial Research Institute for Automation > * and Measurements PIAP > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * Notes > * ----- > * > --- a/drivers/media/pci/tw686x/tw686x-video.c > +++ b/drivers/media/pci/tw686x/tw686x-video.c > @@ -1,14 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2015 VanguardiaSur - www.vanguardiasur.com.ar > * > * Based on original driver by Krzysztof Ha?asa: > * Copyright (C) 2015 Industrial Research Institute for Automation > * and Measurements PIAP > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > */ > > #include <linux/init.h> > --- a/drivers/media/pci/tw686x/tw686x.h > +++ b/drivers/media/pci/tw686x/tw686x.h > @@ -1,13 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2015 VanguardiaSur - www.vanguardiasur.com.ar > * > * Copyright (C) 2015 Industrial Research Institute for Automation > * and Measurements PIAP > * Written by Krzysztof Ha?asa > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/mutex.h> > --- a/drivers/media/v4l2-core/v4l2-fwnode.c > +++ b/drivers/media/v4l2-core/v4l2-fwnode.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * V4L2 fwnode binding parsing library > * > @@ -12,10 +13,6 @@ > * > * Copyright (C) 2012 Renesas Electronics Corp. > * Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of version 2 of the GNU General Public License as > - * published by the Free Software Foundation. > */ > #include <linux/acpi.h> > #include <linux/kernel.h> > --- a/drivers/misc/cs5535-mfgpt.c > +++ b/drivers/misc/cs5535-mfgpt.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Driver for the CS5535/CS5536 Multi-Function General Purpose Timers (MFGPT) > * > @@ -5,10 +6,6 @@ > * Copyright (C) 2007 Andres Salomon <dilinger@xxxxxxxxxx> > * Copyright (C) 2009 Andres Salomon <dilinger@xxxxxxxxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * The MFGPTs are documented in AMD Geode CS5536 Companion Device Data Book. > */ > > --- a/drivers/net/ethernet/cavium/thunder/nic.h > +++ b/drivers/net/ethernet/cavium/thunder/nic.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2015 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef NIC_H > --- a/drivers/net/ethernet/cavium/thunder/nic_main.c > +++ b/drivers/net/ethernet/cavium/thunder/nic_main.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2015 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/module.h> > --- a/drivers/net/ethernet/cavium/thunder/nic_reg.h > +++ b/drivers/net/ethernet/cavium/thunder/nic_reg.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2015 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef NIC_REG_H > --- a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c > +++ b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2015 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > /* ETHTOOL Support for VNIC_VF Device*/ > --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c > +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2015 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/module.h> > --- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c > +++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2015 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/pci.h> > --- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.h > +++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2015 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef NICVF_QUEUES_H > --- a/drivers/net/ethernet/cavium/thunder/q_struct.h > +++ b/drivers/net/ethernet/cavium/thunder/q_struct.h > @@ -1,12 +1,9 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * This file contains HW queue descriptor formats, config register > * structures etc > * > * Copyright (C) 2015 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef Q_STRUCT_H > --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c > +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2015 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/acpi.h> > --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h > +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (C) 2015 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #ifndef THUNDER_BGX_H > --- a/drivers/net/ethernet/cavium/thunder/thunder_xcv.c > +++ b/drivers/net/ethernet/cavium/thunder/thunder_xcv.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (C) 2016 Cavium, Inc. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/acpi.h> > --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c > +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Intel IXP4xx Ethernet driver for Linux > * > * Copyright (C) 2007 Krzysztof Halasa <khc@xxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * Ethernet port config (0x00 is not present on IXP42X): > * > * logical port 0x00 0x10 0x20 > @@ -16,7 +13,6 @@ > * RX-free queue 26 27 28 > * TX-done queue is always 31, per-port RX and TX-ready queues are configurable > * > - * > * Queue entries: > * bits 0 -> 1 - NPE ID (RX and TX-done) > * bits 0 -> 2 - priority (TX, per 802.1D) > --- a/drivers/net/wan/c101.c > +++ b/drivers/net/wan/c101.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Moxa C101 synchronous serial card driver for Linux > * > * Copyright (C) 2000-2003 Krzysztof Halasa <khc@xxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * For information see <http://www.kernel.org/pub/linux/utils/net/hdlc/> > * > * Sources of information: > --- a/drivers/net/wan/hd64570.c > +++ b/drivers/net/wan/hd64570.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Hitachi SCA HD64570 driver for Linux > * > * Copyright (C) 1998-2003 Krzysztof Halasa <khc@xxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * Source of information: Hitachi HD64570 SCA User's Manual > * > * We use the following SCA memory map: > --- a/drivers/net/wan/hd64572.c > +++ b/drivers/net/wan/hd64572.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Hitachi (now Renesas) SCA-II HD64572 driver for Linux > * > * Copyright (C) 1998-2008 Krzysztof Halasa <khc@xxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * Source of information: HD64572 SCA-II User's Manual > * > * We use the following SCA memory map: > --- a/drivers/net/wan/hdlc.c > +++ b/drivers/net/wan/hdlc.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Generic HDLC support routines for Linux > * > * Copyright (C) 1999 - 2008 Krzysztof Halasa <khc@xxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * Currently supported: > * * raw IP-in-HDLC > * * Cisco HDLC > --- a/drivers/net/wan/hdlc_cisco.c > +++ b/drivers/net/wan/hdlc_cisco.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Generic HDLC support routines for Linux > * Cisco HDLC support > * > * Copyright (C) 2000 - 2006 Krzysztof Halasa <khc@xxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/errno.h> > --- a/drivers/net/wan/hdlc_fr.c > +++ b/drivers/net/wan/hdlc_fr.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Generic HDLC support routines for Linux > * Frame Relay support > * > * Copyright (C) 1999 - 2006 Krzysztof Halasa <khc@xxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > > Theory of PVC state > > --- a/drivers/net/wan/hdlc_ppp.c > +++ b/drivers/net/wan/hdlc_ppp.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Generic HDLC support routines for Linux > * Point-to-point protocol support > * > * Copyright (C) 1999 - 2008 Krzysztof Halasa <khc@xxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/errno.h> > --- a/drivers/net/wan/hdlc_raw.c > +++ b/drivers/net/wan/hdlc_raw.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Generic HDLC support routines for Linux > * HDLC support > * > * Copyright (C) 1999 - 2006 Krzysztof Halasa <khc@xxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/errno.h> > --- a/drivers/net/wan/hdlc_raw_eth.c > +++ b/drivers/net/wan/hdlc_raw_eth.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Generic HDLC support routines for Linux > * HDLC Ethernet emulation support > * > * Copyright (C) 2002-2006 Krzysztof Halasa <khc@xxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/errno.h> > --- a/drivers/net/wan/hdlc_x25.c > +++ b/drivers/net/wan/hdlc_x25.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Generic HDLC support routines for Linux > * X.25 support > * > * Copyright (C) 1999 - 2006 Krzysztof Halasa <khc@xxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #include <linux/errno.h> > --- a/drivers/net/wan/ixp4xx_hss.c > +++ b/drivers/net/wan/ixp4xx_hss.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Intel IXP4xx HSS (synchronous serial port) driver for Linux > * > * Copyright (C) 2007-2008 Krzysztof Hałasa <khc@xxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > --- a/drivers/net/wan/n2.c > +++ b/drivers/net/wan/n2.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * SDL Inc. RISCom/N2 synchronous serial card driver for Linux > * > * Copyright (C) 1998-2003 Krzysztof Halasa <khc@xxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * For information see <http://www.kernel.org/pub/linux/utils/net/hdlc/> > * > * Note: integrated CSU/DSU/DDS are not supported by this driver > --- a/drivers/net/wan/pc300too.c > +++ b/drivers/net/wan/pc300too.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Cyclades PC300 synchronous serial card driver for Linux > * > * Copyright (C) 2000-2008 Krzysztof Halasa <khc@xxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * For information see <http://www.kernel.org/pub/linux/utils/net/hdlc/>. > * > * Sources of information: > --- a/drivers/net/wan/pci200syn.c > +++ b/drivers/net/wan/pci200syn.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Goramo PCI200SYN synchronous serial card driver for Linux > * > * Copyright (C) 2002-2008 Krzysztof Halasa <khc@xxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * For information see <http://www.kernel.org/pub/linux/utils/net/hdlc/> > * > * Sources of information: > --- a/drivers/net/wan/wanxl.c > +++ b/drivers/net/wan/wanxl.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * wanXL serial card driver for Linux > * host part > * > * Copyright (C) 2003 Krzysztof Halasa <khc@xxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License > - * as published by the Free Software Foundation. > - * > * Status: > * - Only DTE (external clock) support with NRZ and NRZI encodings > * - wanXL100 will require minor driver modifications, no access to hw > --- a/drivers/net/wan/wanxl.h > +++ b/drivers/net/wan/wanxl.h > @@ -1,12 +1,9 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * wanXL serial card driver for Linux > * definitions common to host driver and card firmware > > -- Steve Winslow Director of Strategic Programs The Linux Foundation swinslow@xxxxxxxxxxxxxxxxxxx