summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-05-19 09:51:33 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-21 05:28:40 -0400
commit3a63cbb8db7178550c7b428c98532b35853d1f40 (patch)
treea69036c1afdbf9c38882aa7f70743ace1da72cde
parent16216333235adf51093d0330a934a7e4a03134fe (diff)
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 3
Based on 1 normalized pattern(s): this program is free software you can redistribute it and or modify it under the terms of the gnu general public license version 2 or later as published by the free software foundation extracted by the scancode license scanner the SPDX license identifier GPL-2.0-or-later has been chosen to replace the boilerplate/reference in 9 file(s). Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Steve Winslow <swinslow@gmail.com> Reviewed-by: Jilayne Lovejoy <opensource@jilayne.com> Reviewed-by: Allison Randal <allison@lohutok.net> Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org> Cc: linux-spdx@vger.kernel.org Link: https://lkml.kernel.org/r/20190519154040.848507137@linutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/boot/dts/omap3-n900.dts5
-rw-r--r--arch/mips/jz4740/board-qi_lb60.c5
-rw-r--r--drivers/hwmon/aspeed-pwm-tacho.c5
-rw-r--r--net/ipv4/netfilter/nf_dup_ipv4.c5
-rw-r--r--net/ipv6/netfilter/nf_dup_ipv6.c5
-rw-r--r--net/netfilter/xt_TEE.c5
-rw-r--r--sound/soc/atmel/atmel-classd.c5
-rw-r--r--sound/soc/atmel/atmel-pdmic.c5
8 files changed, 8 insertions, 32 deletions
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 826920e6b878..84a5ade1e865 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -1,10 +1,7 @@
1// SPDX-License-Identifier: GPL-2.0-or-later
1/* 2/*
2 * Copyright (C) 2013 Pavel Machek <pavel@ucw.cz> 3 * Copyright (C) 2013 Pavel Machek <pavel@ucw.cz>
3 * Copyright (C) 2013-2014 Aaro Koskinen <aaro.koskinen@iki.fi> 4 * Copyright (C) 2013-2014 Aaro Koskinen <aaro.koskinen@iki.fi>
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 2 (or later) as
7 * published by the Free Software Foundation.
8 */ 5 */
9 6
10/dts-v1/; 7/dts-v1/;
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
index 6718efb400f4..071e9d94eea7 100644
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0-or-later
1/* 2/*
2 * linux/arch/mips/jz4740/board-qi_lb60.c 3 * linux/arch/mips/jz4740/board-qi_lb60.c
3 * 4 *
@@ -6,10 +7,6 @@
6 * Copyright (c) 2009 Qi Hardware inc., 7 * Copyright (c) 2009 Qi Hardware inc.,
7 * Author: Xiangfu Liu <xiangfu@qi-hardware.com> 8 * Author: Xiangfu Liu <xiangfu@qi-hardware.com>
8 * Copyright 2010, Lars-Peter Clausen <lars@metafoo.de> 9 * Copyright 2010, Lars-Peter Clausen <lars@metafoo.de>
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License version 2 or later
12 * as published by the Free Software Foundation.
13 */ 10 */
14 11
15#include <linux/kernel.h> 12#include <linux/kernel.h>
diff --git a/drivers/hwmon/aspeed-pwm-tacho.c b/drivers/hwmon/aspeed-pwm-tacho.c
index 0daf0b32aa4a..40c489be62ea 100644
--- a/drivers/hwmon/aspeed-pwm-tacho.c
+++ b/drivers/hwmon/aspeed-pwm-tacho.c
@@ -1,9 +1,6 @@
1// SPDX-License-Identifier: GPL-2.0-or-later
1/* 2/*
2 * Copyright (c) 2016 Google, Inc 3 * Copyright (c) 2016 Google, Inc
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 or later as
6 * published by the Free Software Foundation.
7 */ 4 */
8 5
9#include <linux/clk.h> 6#include <linux/clk.h>
diff --git a/net/ipv4/netfilter/nf_dup_ipv4.c b/net/ipv4/netfilter/nf_dup_ipv4.c
index 39895b9ddeb9..af3fbf76dbd3 100644
--- a/net/ipv4/netfilter/nf_dup_ipv4.c
+++ b/net/ipv4/netfilter/nf_dup_ipv4.c
@@ -1,12 +1,9 @@
1// SPDX-License-Identifier: GPL-2.0-or-later
1/* 2/*
2 * (C) 2007 by Sebastian Claßen <sebastian.classen@freenet.ag> 3 * (C) 2007 by Sebastian Claßen <sebastian.classen@freenet.ag>
3 * (C) 2007-2010 by Jan Engelhardt <jengelh@medozas.de> 4 * (C) 2007-2010 by Jan Engelhardt <jengelh@medozas.de>
4 * 5 *
5 * Extracted from xt_TEE.c 6 * Extracted from xt_TEE.c
6 *
7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License version 2 or later, as
9 * published by the Free Software Foundation.
10 */ 7 */
11#include <linux/ip.h> 8#include <linux/ip.h>
12#include <linux/module.h> 9#include <linux/module.h>
diff --git a/net/ipv6/netfilter/nf_dup_ipv6.c b/net/ipv6/netfilter/nf_dup_ipv6.c
index 4a7ddeddbaab..e6c9da9866b1 100644
--- a/net/ipv6/netfilter/nf_dup_ipv6.c
+++ b/net/ipv6/netfilter/nf_dup_ipv6.c
@@ -1,12 +1,9 @@
1// SPDX-License-Identifier: GPL-2.0-or-later
1/* 2/*
2 * (C) 2007 by Sebastian Claßen <sebastian.classen@freenet.ag> 3 * (C) 2007 by Sebastian Claßen <sebastian.classen@freenet.ag>
3 * (C) 2007-2010 by Jan Engelhardt <jengelh@medozas.de> 4 * (C) 2007-2010 by Jan Engelhardt <jengelh@medozas.de>
4 * 5 *
5 * Extracted from xt_TEE.c 6 * Extracted from xt_TEE.c
6 *
7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License version 2 or later, as
9 * published by the Free Software Foundation.
10 */ 7 */
11#include <linux/module.h> 8#include <linux/module.h>
12#include <linux/percpu.h> 9#include <linux/percpu.h>
diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_TEE.c
index 1dae02a97ee3..a5ebd5640457 100644
--- a/net/netfilter/xt_TEE.c
+++ b/net/netfilter/xt_TEE.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0-or-later
1/* 2/*
2 * "TEE" target extension for Xtables 3 * "TEE" target extension for Xtables
3 * Copyright © Sebastian Claßen, 2007 4 * Copyright © Sebastian Claßen, 2007
@@ -5,10 +6,6 @@
5 * 6 *
6 * based on ipt_ROUTE.c from Cédric de Launois 7 * based on ipt_ROUTE.c from Cédric de Launois
7 * <delaunois@info.ucl.be> 8 * <delaunois@info.ucl.be>
8 *
9 * This program is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU General Public License
11 * version 2 or later, as published by the Free Software Foundation.
12 */ 9 */
13#include <linux/module.h> 10#include <linux/module.h>
14#include <linux/skbuff.h> 11#include <linux/skbuff.h>
diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index 3d70061901a0..94de94b55105 100644
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -1,12 +1,9 @@
1// SPDX-License-Identifier: GPL-2.0-or-later
1/* Atmel ALSA SoC Audio Class D Amplifier (CLASSD) driver 2/* Atmel ALSA SoC Audio Class D Amplifier (CLASSD) driver
2 * 3 *
3 * Copyright (C) 2015 Atmel 4 * Copyright (C) 2015 Atmel
4 * 5 *
5 * Author: Songjun Wu <songjun.wu@atmel.com> 6 * Author: Songjun Wu <songjun.wu@atmel.com>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 or later
9 * as published by the Free Software Foundation.
10 */ 7 */
11 8
12#include <linux/of.h> 9#include <linux/of.h>
diff --git a/sound/soc/atmel/atmel-pdmic.c b/sound/soc/atmel/atmel-pdmic.c
index 915c2b064de1..c61fa4a5ebc0 100644
--- a/sound/soc/atmel/atmel-pdmic.c
+++ b/sound/soc/atmel/atmel-pdmic.c
@@ -1,12 +1,9 @@
1// SPDX-License-Identifier: GPL-2.0-or-later
1/* Atmel PDMIC driver 2/* Atmel PDMIC driver
2 * 3 *
3 * Copyright (C) 2015 Atmel 4 * Copyright (C) 2015 Atmel
4 * 5 *
5 * Author: Songjun Wu <songjun.wu@atmel.com> 6 * Author: Songjun Wu <songjun.wu@atmel.com>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 or later
9 * as published by the Free Software Foundation.
10 */ 7 */
11 8
12#include <linux/of.h> 9#include <linux/of.h>