On Mon, May 27, 2019 at 4:53 AM Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote: > > From: Thomas Gleixner tglx@xxxxxxxxxxxxx > > 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@xxxxxxxxxxxxx> > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch8&id=7094cbdd40ec > --- > arch/x86/kernel/cpu/mce/inject.c | 9 +-------- > drivers/edac/ghes_edac.c | 4 +--- > drivers/edac/i7300_edac.c | 4 +--- > drivers/edac/i7core_edac.c | 4 +--- > drivers/edac/sb_edac.c | 4 +--- > drivers/media/i2c/ov7670.c | 4 +--- > drivers/media/platform/marvell-ccic/cafe-driver.c | 4 +--- > drivers/media/platform/marvell-ccic/mmp-driver.c | 4 +--- > include/media/i2c/ov7670.h | 4 +--- > 9 files changed, 9 insertions(+), 32 deletions(-) > > --- a/arch/x86/kernel/cpu/mce/inject.c > +++ b/arch/x86/kernel/cpu/mce/inject.c > @@ -1,12 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * 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 <bp@xxxxxxxxx> > * Advanced Micro Devices Inc. > */ > --- a/drivers/edac/ghes_edac.c > +++ b/drivers/edac/ghes_edac.c > @@ -1,9 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * GHES/EDAC Linux driver > * > - * This file may be distributed under the terms of the GNU General Public > - * License version 2. > - * > * Copyright (c) 2013 by Mauro Carvalho Chehab > * > * Red Hat Inc. http://www.redhat.com > --- a/drivers/edac/i7300_edac.c > +++ b/drivers/edac/i7300_edac.c > @@ -1,9 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Intel 7300 class Memory Controllers kernel module (Clarksboro) > * > - * This file may be distributed under the terms of the > - * GNU General Public License version 2 only. > - * > * Copyright (c) 2010 by: > * Mauro Carvalho Chehab > * > --- a/drivers/edac/i7core_edac.c > +++ b/drivers/edac/i7core_edac.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* Intel i7 core/Nehalem Memory Controller kernel module > * > * This driver supports the memory controllers found on the Intel > @@ -5,9 +6,6 @@ > * Xeon 55xx and Xeon 56xx also known as Nehalem, Nehalem-EP, Lynnfield > * and Westmere-EP. > * > - * This file may be distributed under the terms of the > - * GNU General Public License version 2 only. > - * > * Copyright (c) 2009-2010 by: > * Mauro Carvalho Chehab > * > --- a/drivers/edac/sb_edac.c > +++ b/drivers/edac/sb_edac.c > @@ -1,11 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* Intel Sandy Bridge -EN/-EP/-EX Memory Controller kernel module > * > * This driver supports the memory controllers found on the Intel > * processor family Sandy Bridge. > * > - * This file may be distributed under the terms of the > - * GNU General Public License version 2 only. > - * > * Copyright (c) 2011 by: > * Mauro Carvalho Chehab > */ > --- a/drivers/media/i2c/ov7670.c > +++ b/drivers/media/i2c/ov7670.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * A V4L2 driver for OmniVision OV7670 cameras. > * > @@ -6,9 +7,6 @@ > * McClelland's ovcamchip code. > * > * Copyright 2006-7 Jonathan Corbet <corbet@xxxxxxx> > - * > - * This file may be distributed under the terms of the GNU General > - * Public License, version 2. > */ > #include <linux/clk.h> > #include <linux/init.h> > --- a/drivers/media/platform/marvell-ccic/cafe-driver.c > +++ b/drivers/media/platform/marvell-ccic/cafe-driver.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * A driver for the CMOS camera controller in the Marvell 88ALP01 "cafe" > * multifunction chip. Currently works with the Omnivision OV7670 > @@ -13,9 +14,6 @@ > * > * v4l2_device/v4l2_subdev conversion by: > * Copyright (C) 2009 Hans Verkuil <hverkuil@xxxxxxxxx> > - * > - * This file may be distributed under the terms of the GNU General > - * Public License, version 2. > */ > #include <linux/kernel.h> > #include <linux/module.h> > --- a/drivers/media/platform/marvell-ccic/mmp-driver.c > +++ b/drivers/media/platform/marvell-ccic/mmp-driver.c > @@ -1,11 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-only > /* > * Support for the camera device found on Marvell MMP processors; known > * to work with the Armada 610 as used in the OLPC 1.75 system. > * > * Copyright 2011 Jonathan Corbet <corbet@xxxxxxx> > - * > - * This file may be distributed under the terms of the GNU General > - * Public License, version 2. > */ > > #include <linux/init.h> > --- a/include/media/i2c/ov7670.h > +++ b/include/media/i2c/ov7670.h > @@ -1,10 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > /* > * A V4L2 driver for OmniVision OV7670 cameras. > * > * Copyright 2010 One Laptop Per Child > - * > - * This file may be distributed under the terms of the GNU General > - * Public License, version 2. > */ > > #ifndef __OV7670_H > There are actually two patterns here, some with "only" after "version 2", some without. However agree that all should map to GPL-2.0-only. Reviewed-by: Kate Stewart <kstewart@xxxxxxxxxxxxxxxxxxx>
