Add SPDX identifiers to some more files
Subsystems (4)
Borislav Petkov
maintainercover Add SPDX identifiers to some more files
From: Borislav Petkov <[email protected]>
Hi,
here's some more files converted to SPDX identifiers.
In the MCE and microcode cases, I've made one patch per subsystem as this is shared functionality so maybe splitting them even more would not make any sense.
But I could be wrong and the lawyer logic could very well work in a completely different way so I'm open to suggestions here.
Thanks.
Borislav Petkov (4):
EDAC, mce_amd: Add an SPDX identifier
EDAC, amd64: Add SPDX identifiers
x86/microcode: Add SPDX license identifiers
x86/mce: Add an SPDX license identifiers
arch/x86/kernel/cpu/mcheck/dev-mcelog.c | 1 + arch/x86/kernel/cpu/mcheck/mce-apei.c | 14 +------------- arch/x86/kernel/cpu/mcheck/mce-genpool.c | 3 +-- arch/x86/kernel/cpu/mcheck/mce-inject.c | 9 +-------- arch/x86/kernel/cpu/mcheck/mce-severity.c | 6 +----- arch/x86/kernel/cpu/mcheck/mce.c | 1 + arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 + arch/x86/kernel/cpu/microcode/amd.c | 4 +--- arch/x86/kernel/cpu/microcode/core.c | 6 +----- arch/x86/kernel/cpu/microcode/intel.c | 6 +----- drivers/edac/amd64_edac.c | 1 + drivers/edac/amd64_edac.h | 4 +--- drivers/edac/mce_amd.c | 1 + 13 files changed, 13 insertions(+), 44 deletions(-)
Signature · 1 line
2.19.1
Borislav Petkov
maintainerPATCH 1/4 EDAC, mce_amd: Add an SPDX identifier
From: Borislav Petkov <[email protected]>
While the license of this file can be deduced by the MODULE_LICENSE() information, each source file should contain a SPDX identifier. Module license 'GPL' is equivalent to GPL v2 only, i.e. the kernel license. Add the corresponding SPDX identifier.
Signed-off-by Borislav Petkov <[email protected]>
Cc Tom Lendacky <[email protected]>
--- drivers/edac/mce_amd.c | 1 + 1 file changed, 1 insertion(+)
drivers/edac/mce_amd.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/module.h> #include <linux/slab.h>
Signature · 1 line
2.19.1
Borislav Petkov
maintainerPATCH 2/4 EDAC, amd64: Add SPDX identifiers
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
While the license of these files can be deduced by the MODULE_LICENSE() information, each source file should contain a SPDX identifier. Module license 'GPL' is equivalent to GPL v2 only, i.e. the kernel license. Add the corresponding SPDX identifier.
Signed-off-by Borislav Petkov <[email protected]>
Cc Tom Lendacky <[email protected]>
Cc Doug Thompson <[email protected]>
Cc Doug Thompson <[email protected]>
--- drivers/edac/amd64_edac.c | 1 + drivers/edac/amd64_edac.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/edac/amd64_edac.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include "amd64_edac.h" #include <asm/amd_nb.h>
drivers/edac/amd64_edac.h +1 -3
@@ -1,11 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * AMD64 class Memory Controller kernel module * * Copyright (c) 2009 SoftwareBitMaker. * Copyright (c) 2009-15 Advanced Micro Devices, Inc. -* -* This file may be distributed under the terms of the -* GNU General Public License. */ #include <linux/module.h>
Signature · 1 line
2.19.1
Borislav Petkov
maintainerPATCH 3/4 x86/microcode: Add SPDX license identifiers
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
... and drop the GPL v2 license free text.
Signed-off-by Borislav Petkov <[email protected]>
Cc Fenghua Yu <[email protected]>
Cc "H Peter Anvin" <[email protected]>
Cc Shaohua Li <[email protected]>
Cc Tigran Aivazian <[email protected]>
Cc Tom Lendacky <[email protected]>
--- arch/x86/kernel/cpu/microcode/amd.c | 4 +--- arch/x86/kernel/cpu/microcode/core.c | 6 +----- arch/x86/kernel/cpu/microcode/intel.c | 6 +----- 3 files changed, 3 insertions(+), 13 deletions(-)
arch/x86/kernel/cpu/microcode/amd.c +1 -3
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * AMD CPU Microcode Update Driver for Linux *
@@ -17,9 +18,6 @@* * Author: Jacob Shin <[email protected]> * Fixes: Borislav Petkov <[email protected]> -* -* Licensed under the terms of the GNU General Public -* License version 2. See file COPYING for details. */ #define pr_fmt (fmt) "microcode: " fmt
arch/x86/kernel/cpu/microcode/core.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * CPU Microcode Update Driver for Linux *
@@ -12,11 +13,6 @@* (C) 2015 Borislav Petkov <[email protected]> * * This driver allows to upgrade microcode on x86 processors. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. */ #define pr_fmt (fmt) "microcode: " fmt
arch/x86/kernel/cpu/microcode/intel.c +1 -5
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Intel CPU Microcode Update Driver for Linux *
@@ -8,11 +9,6 @@* * Copyright (C) 2012 Fenghua Yu <[email protected]> * H Peter Anvin" <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. */ /*
Signature · 1 line
2.19.1
Re: [PATCH 3/4] x86/microcode: Add SPDX license identifiers
Hi Borislav,
Ok, that's fine. I noticed these things when changing BFS code a couple of days ago and wondered what they were --- now I know :)
Kind regards,
Tigran
Quoted 81 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
... and drop the GPL v2 license free text.
Signed-off-by Borislav Petkov <[email protected]>Cc Fenghua Yu <[email protected]>Cc "H Peter Anvin" <[email protected]>Cc Shaohua Li <[email protected]>Cc Tigran Aivazian <[email protected]>Cc Tom Lendacky <[email protected]>--- arch/x86/kernel/cpu/microcode/amd.c | 4 +--- arch/x86/kernel/cpu/microcode/core.c | 6 +----- arch/x86/kernel/cpu/microcode/intel.c | 6 +----- 3 files changed, 3 insertions(+), 13 deletions(-)arch/x86/kernel/cpu/microcode/amd.c +1
-3@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * AMD CPU Microcode Update Driver for Linux * @@ -17,9 +18,6 @@* * Author: Jacob Shin <[email protected]> * Fixes: Borislav Petkov <[email protected]> -* -* Licensed under the terms of the GNU General Public -* License version 2. See file COPYING for details. */ #define pr_fmt (fmt) "microcode: " fmtarch/x86/kernel/cpu/microcode/core.c +1
-5@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * CPU Microcode Update Driver for Linux * @@ -12,11 +13,6 @@* (C) 2015 Borislav Petkov <[email protected]> * * This driver allows to upgrade microcode on x86 processors. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. */ #define pr_fmt (fmt) "microcode: " fmtarch/x86/kernel/cpu/microcode/intel.c +1
-6@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Intel CPU Microcode Update Driver for Linux * @@ -8,11 +9,6 @@* * Copyright (C) 2012 Fenghua Yu <[email protected]> * H Peter Anvin" <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version -* 2 of the License, or (at your option) any later version. */ /* -- 2.19.1
Borislav Petkov
maintainerRe: [PATCH 3/4] x86/microcode: Add SPDX license identifiers
Quoted 2 lines · Tigran Aivazian
Ok, that's fine. I noticed these things when changing BFS code a couple of days ago and wondered what they were --- now I know :)
Thx.
For more info, see
https://www.kernel.org/doc/html/latest/process/license-rules.html
Doc is pretty nice and should explain everything.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Borislav Petkov
maintainerPATCH 4/4 x86/mce: Add an SPDX license identifiers
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
Add the SPDX tag and remove the GPL-v2 free text.
Signed-off-by Borislav Petkov <[email protected]>
Cc Andi Kleen <[email protected]>
Cc <[email protected]>
Cc Huang Ying <[email protected]>
Cc Tom Lendacky <[email protected]>
Cc Tony Luck <[email protected]>
--- arch/x86/kernel/cpu/mcheck/dev-mcelog.c | 1 + arch/x86/kernel/cpu/mcheck/mce-apei.c | 14 +------------- arch/x86/kernel/cpu/mcheck/mce-genpool.c | 3 +-- arch/x86/kernel/cpu/mcheck/mce-inject.c | 9 +-------- arch/x86/kernel/cpu/mcheck/mce-severity.c | 6 +----- arch/x86/kernel/cpu/mcheck/mce.c | 1 + arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 + 7 files changed, 7 insertions(+), 28 deletions(-)
arch/x86/kernel/cpu/mcheck/dev-mcelog.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * /dev/mcelog driver *
arch/x86/kernel/cpu/mcheck/mce-apei.c +1 -13
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Bridge between MCE and APEI *
@@ -13,19 +14,6 @@* * Copyright 2010 Intel Corp. * Author: Huang Ying <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License version -* 2 as published by the Free Software Foundation. -* -* 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. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/export.h>
arch/x86/kernel/cpu/mcheck/mce-genpool.c +1 -2
@@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * MCE event pool management in MCE context * * Copyright (C) 2015 Intel Corp. * Author: Chen, Gong <[email protected]> -* -* This file is licensed under GPLv2. */ #include <linux/smp.h> #include <linux/mm.h>
arch/x86/kernel/cpu/mcheck/mce-inject.c +1 -8
@@ -1,12 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Machine check injection support. * Copyright 2008 Intel Corporation. * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; version 2 -* of the License. -* * Authors: * Andi Kleen * Ying Huang
@@ -16,9 +12,6 @@* built as module so that it can be loaded on production kernels for * testing purposes. * -* This file may be distributed under the terms of the GNU General Public -* License version 2. -* * Copyright (c) 2010-17: Borislav Petkov <[email protected]> * Advanced Micro Devices Inc. */
arch/x86/kernel/cpu/mcheck/mce-severity.c +1 -5
@@ -1,12 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * MCE grading rules. * Copyright 2008, 2009 Intel Corporation. * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; version 2 -* of the License. -* * Author: Andi Kleen */ #include <linux/kernel.h>
arch/x86/kernel/cpu/mcheck/mce.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Machine check handler. *
arch/x86/kernel/cpu/mcheck/therm_throt.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Thermal throttle event support code (such as syslog messaging and rate * limiting) that was factored out from x86_64 (mce_intel.c) and i386 (p4.c).
Signature · 1 line
2.19.1