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 425EDC04AB5 for ; Thu, 6 Jun 2019 12:41:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 060DB20868 for ; Thu, 6 Jun 2019 12:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559824903; bh=QCfAG+PwyUYdTHSf/mqi3tAdYliFaIrgc/t3+nMcPFA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=Eofl00ZEQemEFyMvapuk0myfd6WYYLIp4QKtxAMuMdYYRFr4d3G2FMZ6/si+MmNZP hqOj+EtSujaqtOTeIIy8AsUQ/+2dXKXDGPduhJwzfo3AqKY0XUIXkG/yRv+ZBXVEt7 FLbKNYFkRJLTw97DpyOVy5sFp1QVB9J8WYlqlBcA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725782AbfFFMlm (ORCPT ); Thu, 6 Jun 2019 08:41:42 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:41972 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727009AbfFFMlk (ORCPT ); Thu, 6 Jun 2019 08:41:40 -0400 Received: by mail-qt1-f195.google.com with SMTP id s57so2381747qte.8 for ; Thu, 06 Jun 2019 05:41:40 -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=O+KifGdSzT+sRmxV5XD7baisOwqmyyUytOHJ78nNfF0=; b=QqqAmtMYWObM3EutWKsF1NM2FzVLP57olwCEM9fEwBusU6QVg57K5UNRzIgd2rBVV/ 1hkYgg93miMWt9MCN5NL+sYu0ARQbLtdqcJVOx9BwDuskIzogi/A4tylW/3MFV65zk+H r6l8BTmWzB6xGb7Wtjtj/jzxUMIgsb9Ckc0DY= 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=O+KifGdSzT+sRmxV5XD7baisOwqmyyUytOHJ78nNfF0=; b=i9QyU+ast47DGHsI6x9Gee+U8VUCOW40/fIJQKpCsbsf3GspKY4hp62BkBwnUy2u7z s8zmmy+ipK1yQxconhZ7MSHelO4gNP81PNsMXTXowb2ofhO2FdrmrLyEl3rQUCncsuQW 2EUViFRfd1tGrwQtYgjXgxrss7MEyXbMUm5JvGzaVL+mmMkYiIhmeFKwhQC28nu5Hl3A LaVanfpPf2MokLtGrisSDIKORTUZpq0a8jT1TbvPcJ5JEps9txgiQr36uu8GE1rF4SNx AS7sdw4ozyIJu9cGMSsjR7QP74iRwXtrGKNLoqAoiENQTaH9lSAwkfwacLN63r8kTJHh H8bg== X-Gm-Message-State: APjAAAWpCMPsx4FpSGDFQjohwjn+ACBqWVBIl7tB7e2f+ppvJqeAWNyE w7jtK8P14AD5v4gghPx61ExOZjKJ69zvcLwaXKQuAaCG6a4= X-Google-Smtp-Source: APXvYqw3v7Qkzf1isvNtHIXFSvfbP8ONje51o1tLej7UBBtSSccTQSvwXdFeVb/KgnGgpVcLRHHCeIq+B74dZWRXztg= X-Received: by 2002:ac8:1018:: with SMTP id z24mr39559790qti.206.1559824899681; Thu, 06 Jun 2019 05:41:39 -0700 (PDT) MIME-Version: 1.0 References: <20190606095326.496591298@linutronix.de> <20190606100415.557432979@linutronix.de> In-Reply-To: <20190606100415.557432979@linutronix.de> From: Steve Winslow Date: Thu, 6 Jun 2019 08:41:27 -0400 Message-ID: Subject: Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 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 Same comment here as with COX patch 1/2 rule 100... I'm inclined to suggest adding the tag but leaving the notice here, wrapped in some sort of delimiters that tools can easily detect. On Thu, Jun 6, 2019 at 6:04 AM Thomas Gleixner wrote: > > From: Thomas Gleixner tglx@linutronix.de > > Based on 4 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 as published by > the free software foundation either version 2 of the license or at > your option any later version neither [wim] [van] [sebroeck] nor > [iguana] [vzw] admit liability nor provide warranty for any of this > software this material is provided as is and at no charge > > 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 neither [kernel] [concepts] nor [nils] > [faerber] admit liability nor provide warranty for any of this > software this material is provided as is and at no charge > > 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 neither [oleg] [drokin] nor > [ixcelerator] [com] admit liability nor provide warranty for any of > this software this material is provided as is and at no charge > > 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 neither [alan] [cox] [cymrunet] [ltd] > [wim] [van] [sebroeck] nor [iguana] [vzw] admit liability nor > provide warranty for any of this software this material is provided > as is and at no charge > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-or-later > > has been chosen to replace the boilerplate/reference in 10 file(s). > > Bucket: COX > > Signed-off-by: Thomas Gleixner > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=cox&id=2ebaaf62980f > --- > drivers/watchdog/iTCO_vendor_support.c | 10 +--------- > drivers/watchdog/iTCO_wdt.c | 10 +--------- > drivers/watchdog/nv_tco.h | 10 +--------- > drivers/watchdog/pcwd_pci.c | 10 +--------- > drivers/watchdog/pcwd_usb.c | 10 +--------- > drivers/watchdog/sa1100_wdt.c | 10 +--------- > drivers/watchdog/sch311x_wdt.c | 10 +--------- > drivers/watchdog/watchdog_core.c | 10 +--------- > drivers/watchdog/watchdog_core.h | 10 +--------- > drivers/watchdog/watchdog_dev.c | 11 +---------- > 10 files changed, 10 insertions(+), 91 deletions(-) > > --- a/drivers/watchdog/iTCO_vendor_support.c > +++ b/drivers/watchdog/iTCO_vendor_support.c > @@ -1,16 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * intel TCO vendor specific watchdog driver support > * > * (c) Copyright 2006-2009 Wim Van Sebroeck . > - * > - * 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. > - * > - * Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor > - * provide warranty for any of this software. This material is > - * provided "AS-IS" and at no charge. > */ > > /* > --- a/drivers/watchdog/iTCO_wdt.c > +++ b/drivers/watchdog/iTCO_wdt.c > @@ -1,17 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * intel TCO Watchdog Driver > * > * (c) Copyright 2006-2011 Wim Van Sebroeck . > * > - * 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. > - * > - * Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor > - * provide warranty for any of this software. This material is > - * provided "AS-IS" and at no charge. > - * > * The TCO watchdog is implemented in the following I/O controller hubs: > * (See the intel documentation on http://developer.intel.com.) > * document number 290655-003, 290677-014: 82801AA (ICH), 82801AB (ICHO) > --- a/drivers/watchdog/nv_tco.h > +++ b/drivers/watchdog/nv_tco.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * nv_tco: TCO timer driver for nVidia chipsets. > * > @@ -10,15 +11,6 @@ > * Reserved. > * http://www.kernelconcepts.de > * > - * 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. > - * > - * Neither kernel concepts nor Nils Faerber admit liability nor provide > - * warranty for any of this software. This material is provided > - * "AS-IS" and at no charge. > - * > * (c) Copyright 2000 kernel concepts > * developed for > * Jentro AG, Haar/Munich (Germany) > --- a/drivers/watchdog/pcwd_pci.c > +++ b/drivers/watchdog/pcwd_pci.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Berkshire PCI-PC Watchdog Card Driver > * > @@ -9,15 +10,6 @@ > * Alan Cox , > * Matt Domsch , > * Rob Radez > - * > - * 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. > - * > - * Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor > - * provide warranty for any of this software. This material is > - * provided "AS-IS" and at no charge. > */ > > /* > --- a/drivers/watchdog/pcwd_usb.c > +++ b/drivers/watchdog/pcwd_usb.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Berkshire USB-PC Watchdog Card Driver > * > @@ -10,15 +11,6 @@ > * Rob Radez , > * Greg Kroah-Hartman > * > - * 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. > - * > - * Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor > - * provide warranty for any of this software. This material is > - * provided "AS-IS" and at no charge. > - * > * Thanks also to Simon Machell at Berkshire Products Inc. for > * providing the test hardware. More info is available at > * http://www.berkprod.com/ or http://www.pcwatchdog.com/ > --- a/drivers/watchdog/sa1100_wdt.c > +++ b/drivers/watchdog/sa1100_wdt.c > @@ -1,18 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Watchdog driver for the SA11x0/PXA2xx > * > * (c) Copyright 2000 Oleg Drokin > * Based on SoftDog driver by Alan Cox > * > - * 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. > - * > - * Neither Oleg Drokin nor iXcelerator.com admit liability nor provide > - * warranty for any of this software. This material is provided > - * "AS-IS" and at no charge. > - * > * (c) Copyright 2000 Oleg Drokin > * > * 27/11/2000 Initial release > --- a/drivers/watchdog/sch311x_wdt.c > +++ b/drivers/watchdog/sch311x_wdt.c > @@ -1,17 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * sch311x_wdt.c - Driver for the SCH311x Super-I/O chips > * integrated watchdog. > * > * (c) Copyright 2008 Wim Van Sebroeck . > - * > - * 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. > - * > - * Neither Wim Van Sebroeck nor Iguana vzw. admit liability nor > - * provide warranty for any of this software. This material is > - * provided "AS-IS" and at no charge. > */ > > /* > --- a/drivers/watchdog/watchdog_core.c > +++ b/drivers/watchdog/watchdog_core.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * watchdog_core.c > * > @@ -15,15 +16,6 @@ > * Rusty Lynch > * Satyam Sharma > * Randy Dunlap > - * > - * 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. > - * > - * Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. > - * admit liability nor provide warranty for any of this software. > - * This material is provided "AS-IS" and at no charge. > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > --- a/drivers/watchdog/watchdog_core.h > +++ b/drivers/watchdog/watchdog_core.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * watchdog_core.h > * > @@ -15,15 +16,6 @@ > * Rusty Lynch > * Satyam Sharma > * Randy Dunlap > - * > - * 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. > - * > - * Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. > - * admit liability nor provide warranty for any of this software. > - * This material is provided "AS-IS" and at no charge. > */ > > #define MAX_DOGS 32 /* Maximum number of watchdog devices */ > --- a/drivers/watchdog/watchdog_dev.c > +++ b/drivers/watchdog/watchdog_dev.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * watchdog_dev.c > * > @@ -6,7 +7,6 @@ > * > * (c) Copyright 2008-2011 Wim Van Sebroeck . > * > - * > * This source code is part of the generic code that can be used > * by all the watchdog timer drivers. > * > @@ -19,15 +19,6 @@ > * Rusty Lynch > * Satyam Sharma > * Randy Dunlap > - * > - * 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. > - * > - * Neither Alan Cox, CymruNet Ltd., Wim Van Sebroeck nor Iguana vzw. > - * admit liability nor provide warranty for any of this software. > - * This material is provided "AS-IS" and at no charge. > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > -- Steve Winslow Director of Strategic Programs The Linux Foundation swinslow@linuxfoundation.org