From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AD08C04AB3 for ; Mon, 27 May 2019 13:49:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBDA220859 for ; Mon, 27 May 2019 13:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558964982; bh=XIUC2cuk8LLagS/xoBqBZgkhZLl11hvMRxpr2nbu8fw=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=2V5lgww9yntULkjnJOE+q8OBMz+j9HqyDcBJYOR16vwPGeT1bsDm8sGpaEMCO6xVX +gMTKznsE0fP+9zWDMukxrmhAvL/qQ1aC/xyU7WXmWZewBDNxhXe2Se5sBkVO2YzKx 8ubCDCE38aGr4107Kbddmah96cPLrANsmFSQO5Ig= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726322AbfE0Ntl (ORCPT ); Mon, 27 May 2019 09:49:41 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:44402 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726108AbfE0Ntl (ORCPT ); Mon, 27 May 2019 09:49:41 -0400 Received: by mail-lj1-f195.google.com with SMTP id e13so14717465ljl.11 for ; Mon, 27 May 2019 06:49:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=sPtbnruLRP8oCRCiQ3W+bxX5JQTbscdcp4Inq2g3/3I=; b=MF9irMvet52e/puGpo9YW1eXWWo/9+vtIwp59Qx0mxFn6tGrZj0dP+dlvVIujAIpEW irnbQBul2cGJtXquX0kPb6IcB3a2vBddeVReOvKLWkN2Tcs2ywQIFmZ4MRGv1yVtY4MH 9fhn6HK85VMuwHgrgaqGO7g32COuIg6LfHk/c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=sPtbnruLRP8oCRCiQ3W+bxX5JQTbscdcp4Inq2g3/3I=; b=rSv2zyacLj3zSanWzGkYNiO4JoqCwBSuaJp/HVn+Pd1/00ds9G5wWfGO0d37m+x/Ko 6EwmKCE+5c4izSrXIHX3DtVYym2uFxsEKRhFJ0TDTsuJxFm2jquPfwv9PPOvlmo3GG2W iyNtDY/xhnqXPIUTHg+e8D6gy9avNMBXDT8eG1464NsOMw40gjMoRpXQro1b70HyOroL Jd5kgYgViFWfkPZEfuNy+N06oIeB/bfAngL6pT/zE18jmAWYtrApsxToVtzj9rLqKL1S ok5fyHTElB8HXruh5UonYWtKUKVAcgXXi9sFkWWlTWp+uLNmt1zoPu9mO5MujGx7+Vqp +hDw== X-Gm-Message-State: APjAAAUhFsgtRVdwNB8NBEh9LlOuFOprY/FjzTO7hWJRPg/WmImccNem DM2zQ2cHB+QPqqv7J2cTsNEXNqfm5bqGgE8xA5nXsv5J6VpfjQ== X-Google-Smtp-Source: APXvYqwehAzmJufMcejrIPPXPYRvF0PWa6t9P2fteQ8bjwV9Rogz2Tgu7NnXcIxferCtCRn6xudNQ97/st4+f8yywpc= X-Received: by 2002:a2e:655b:: with SMTP id z88mr57706518ljb.108.1558964978858; Mon, 27 May 2019 06:49:38 -0700 (PDT) MIME-Version: 1.0 References: <20190527065459.647681500@linutronix.de> <20190527070034.395589349@linutronix.de> In-Reply-To: <20190527070034.395589349@linutronix.de> From: Kate Stewart Date: Mon, 27 May 2019 08:49:27 -0500 Message-ID: Subject: Re: [Batch 8 patch 20/23] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 172 To: Thomas Gleixner Cc: linux-spdx@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-spdx-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spdx@vger.kernel.org On Mon, May 27, 2019 at 4:53 AM Thomas Gleixner wrote: > > From: Thomas Gleixner tglx@linutronix.de > > 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 > > --- > 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 > * 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 > - * > - * This file may be distributed under the terms of the GNU General > - * Public License, version 2. > */ > #include > #include > --- 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 > - * > - * This file may be distributed under the terms of the GNU General > - * Public License, version 2. > */ > #include > #include > --- 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 > - * > - * This file may be distributed under the terms of the GNU General > - * Public License, version 2. > */ > > #include > --- 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