diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-05-27 02:55:19 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-30 14:26:39 -0400 |
commit | 122375508ba37bdb0a99bf9c78f54500368aad2a (patch) | |
tree | c2acfb37df69aaf0b0b11c9724131488b827c6b7 | |
parent | 4d3f18bb73d9f08ca85ea2ac24e6de2aa3144b0f (diff) |
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 172
Based on 1 normalized pattern(s):
this file may be distributed under the terms of the gnu general
public license version 2
extracted by the scancode license scanner the SPDX license identifier
GPL-2.0-only
has been chosen to replace the boilerplate/reference in 9 file(s).
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Allison Randal <allison@lohutok.net>
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Richard Fontana <rfontana@redhat.com>
Cc: linux-spdx@vger.kernel.org
Link: https://lkml.kernel.org/r/20190527070034.395589349@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | arch/x86/kernel/cpu/mce/inject.c | 9 | ||||
-rw-r--r-- | drivers/edac/ghes_edac.c | 4 | ||||
-rw-r--r-- | drivers/edac/i7300_edac.c | 4 | ||||
-rw-r--r-- | drivers/edac/i7core_edac.c | 4 | ||||
-rw-r--r-- | drivers/edac/sb_edac.c | 4 | ||||
-rw-r--r-- | drivers/media/i2c/ov7670.c | 4 | ||||
-rw-r--r-- | drivers/media/platform/marvell-ccic/cafe-driver.c | 4 | ||||
-rw-r--r-- | drivers/media/platform/marvell-ccic/mmp-driver.c | 4 | ||||
-rw-r--r-- | include/media/i2c/ov7670.h | 4 |
9 files changed, 9 insertions, 32 deletions
diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c index a6026170af92..5d108f70f315 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c | |||
@@ -1,12 +1,8 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Machine check injection support. | 3 | * Machine check injection support. |
3 | * Copyright 2008 Intel Corporation. | 4 | * Copyright 2008 Intel Corporation. |
4 | * | 5 | * |
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public License | ||
7 | * as published by the Free Software Foundation; version 2 | ||
8 | * of the License. | ||
9 | * | ||
10 | * Authors: | 6 | * Authors: |
11 | * Andi Kleen | 7 | * Andi Kleen |
12 | * Ying Huang | 8 | * Ying Huang |
@@ -16,9 +12,6 @@ | |||
16 | * built as module so that it can be loaded on production kernels for | 12 | * built as module so that it can be loaded on production kernels for |
17 | * testing purposes. | 13 | * testing purposes. |
18 | * | 14 | * |
19 | * This file may be distributed under the terms of the GNU General Public | ||
20 | * License version 2. | ||
21 | * | ||
22 | * Copyright (c) 2010-17: Borislav Petkov <bp@alien8.de> | 15 | * Copyright (c) 2010-17: Borislav Petkov <bp@alien8.de> |
23 | * Advanced Micro Devices Inc. | 16 | * Advanced Micro Devices Inc. |
24 | */ | 17 | */ |
diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index 49396bf6ad88..7f19f1c672c3 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c | |||
@@ -1,9 +1,7 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * GHES/EDAC Linux driver | 3 | * GHES/EDAC Linux driver |
3 | * | 4 | * |
4 | * This file may be distributed under the terms of the GNU General Public | ||
5 | * License version 2. | ||
6 | * | ||
7 | * Copyright (c) 2013 by Mauro Carvalho Chehab | 5 | * Copyright (c) 2013 by Mauro Carvalho Chehab |
8 | * | 6 | * |
9 | * Red Hat Inc. http://www.redhat.com | 7 | * Red Hat Inc. http://www.redhat.com |
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index 6b5a554ba8e4..7bf910d54d11 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c | |||
@@ -1,9 +1,7 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Intel 7300 class Memory Controllers kernel module (Clarksboro) | 3 | * Intel 7300 class Memory Controllers kernel module (Clarksboro) |
3 | * | 4 | * |
4 | * This file may be distributed under the terms of the | ||
5 | * GNU General Public License version 2 only. | ||
6 | * | ||
7 | * Copyright (c) 2010 by: | 5 | * Copyright (c) 2010 by: |
8 | * Mauro Carvalho Chehab | 6 | * Mauro Carvalho Chehab |
9 | * | 7 | * |
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 40297550313a..a71cca6eeb33 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c | |||
@@ -1,3 +1,4 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* Intel i7 core/Nehalem Memory Controller kernel module | 2 | /* Intel i7 core/Nehalem Memory Controller kernel module |
2 | * | 3 | * |
3 | * This driver supports the memory controllers found on the Intel | 4 | * This driver supports the memory controllers found on the Intel |
@@ -5,9 +6,6 @@ | |||
5 | * Xeon 55xx and Xeon 56xx also known as Nehalem, Nehalem-EP, Lynnfield | 6 | * Xeon 55xx and Xeon 56xx also known as Nehalem, Nehalem-EP, Lynnfield |
6 | * and Westmere-EP. | 7 | * and Westmere-EP. |
7 | * | 8 | * |
8 | * This file may be distributed under the terms of the | ||
9 | * GNU General Public License version 2 only. | ||
10 | * | ||
11 | * Copyright (c) 2009-2010 by: | 9 | * Copyright (c) 2009-2010 by: |
12 | * Mauro Carvalho Chehab | 10 | * Mauro Carvalho Chehab |
13 | * | 11 | * |
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 9353c3fc7c05..fa700a170380 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c | |||
@@ -1,11 +1,9 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* Intel Sandy Bridge -EN/-EP/-EX Memory Controller kernel module | 2 | /* Intel Sandy Bridge -EN/-EP/-EX Memory Controller kernel module |
2 | * | 3 | * |
3 | * This driver supports the memory controllers found on the Intel | 4 | * This driver supports the memory controllers found on the Intel |
4 | * processor family Sandy Bridge. | 5 | * processor family Sandy Bridge. |
5 | * | 6 | * |
6 | * This file may be distributed under the terms of the | ||
7 | * GNU General Public License version 2 only. | ||
8 | * | ||
9 | * Copyright (c) 2011 by: | 7 | * Copyright (c) 2011 by: |
10 | * Mauro Carvalho Chehab | 8 | * Mauro Carvalho Chehab |
11 | */ | 9 | */ |
diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c index 44c3eed8a858..53385c277792 100644 --- a/drivers/media/i2c/ov7670.c +++ b/drivers/media/i2c/ov7670.c | |||
@@ -1,3 +1,4 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * A V4L2 driver for OmniVision OV7670 cameras. | 3 | * A V4L2 driver for OmniVision OV7670 cameras. |
3 | * | 4 | * |
@@ -6,9 +7,6 @@ | |||
6 | * McClelland's ovcamchip code. | 7 | * McClelland's ovcamchip code. |
7 | * | 8 | * |
8 | * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net> | 9 | * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net> |
9 | * | ||
10 | * This file may be distributed under the terms of the GNU General | ||
11 | * Public License, version 2. | ||
12 | */ | 10 | */ |
13 | #include <linux/clk.h> | 11 | #include <linux/clk.h> |
14 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/drivers/media/platform/marvell-ccic/cafe-driver.c b/drivers/media/platform/marvell-ccic/cafe-driver.c index 8d00d9d8adff..cd108b14b715 100644 --- a/drivers/media/platform/marvell-ccic/cafe-driver.c +++ b/drivers/media/platform/marvell-ccic/cafe-driver.c | |||
@@ -1,3 +1,4 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * A driver for the CMOS camera controller in the Marvell 88ALP01 "cafe" | 3 | * A driver for the CMOS camera controller in the Marvell 88ALP01 "cafe" |
3 | * multifunction chip. Currently works with the Omnivision OV7670 | 4 | * multifunction chip. Currently works with the Omnivision OV7670 |
@@ -13,9 +14,6 @@ | |||
13 | * | 14 | * |
14 | * v4l2_device/v4l2_subdev conversion by: | 15 | * v4l2_device/v4l2_subdev conversion by: |
15 | * Copyright (C) 2009 Hans Verkuil <hverkuil@xs4all.nl> | 16 | * Copyright (C) 2009 Hans Verkuil <hverkuil@xs4all.nl> |
16 | * | ||
17 | * This file may be distributed under the terms of the GNU General | ||
18 | * Public License, version 2. | ||
19 | */ | 17 | */ |
20 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
21 | #include <linux/module.h> | 19 | #include <linux/module.h> |
diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c b/drivers/media/platform/marvell-ccic/mmp-driver.c index af76eb637773..bf4d4a47f1db 100644 --- a/drivers/media/platform/marvell-ccic/mmp-driver.c +++ b/drivers/media/platform/marvell-ccic/mmp-driver.c | |||
@@ -1,11 +1,9 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-only | ||
1 | /* | 2 | /* |
2 | * Support for the camera device found on Marvell MMP processors; known | 3 | * Support for the camera device found on Marvell MMP processors; known |
3 | * to work with the Armada 610 as used in the OLPC 1.75 system. | 4 | * to work with the Armada 610 as used in the OLPC 1.75 system. |
4 | * | 5 | * |
5 | * Copyright 2011 Jonathan Corbet <corbet@lwn.net> | 6 | * Copyright 2011 Jonathan Corbet <corbet@lwn.net> |
6 | * | ||
7 | * This file may be distributed under the terms of the GNU General | ||
8 | * Public License, version 2. | ||
9 | */ | 7 | */ |
10 | 8 | ||
11 | #include <linux/init.h> | 9 | #include <linux/init.h> |
diff --git a/include/media/i2c/ov7670.h b/include/media/i2c/ov7670.h index 1913d5123072..8686fc212e27 100644 --- a/include/media/i2c/ov7670.h +++ b/include/media/i2c/ov7670.h | |||
@@ -1,10 +1,8 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
1 | /* | 2 | /* |
2 | * A V4L2 driver for OmniVision OV7670 cameras. | 3 | * A V4L2 driver for OmniVision OV7670 cameras. |
3 | * | 4 | * |
4 | * Copyright 2010 One Laptop Per Child | 5 | * Copyright 2010 One Laptop Per Child |
5 | * | ||
6 | * This file may be distributed under the terms of the GNU General | ||
7 | * Public License, version 2. | ||
8 | */ | 6 | */ |
9 | 7 | ||
10 | #ifndef __OV7670_H | 8 | #ifndef __OV7670_H |