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.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 63D83C04AB5 for ; Thu, 6 Jun 2019 14:30:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2CD4720673 for ; Thu, 6 Jun 2019 14:30:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728776AbfFFOad (ORCPT ); Thu, 6 Jun 2019 10:30:33 -0400 Received: from mail-vk1-f194.google.com ([209.85.221.194]:35529 "EHLO mail-vk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727133AbfFFOad (ORCPT ); Thu, 6 Jun 2019 10:30:33 -0400 Received: by mail-vk1-f194.google.com with SMTP id k1so485948vkb.2 for ; Thu, 06 Jun 2019 07:30:32 -0700 (PDT) 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=j4XNyR2UEmRNC0uJCGWaVXheO+nHv8s6fqdl5nY+8dc=; b=cWP7COI/r2Q8ZK1FsVhaps0S3jbGfap41w4BPmtyckRtk5AGhcBD2OKAoojVqPWxCB ZCeT7jRXA9oG0E2exEQKwOR32zRtQ/e4qlgx/gKVIxHGMqFsBIxgeaRorWMNXH9lqj5d coNBB1MtyYBbxVQrBOh10/0ijEf2+v0jDo2QO5djBbyrmCPwXahEzFeRWEoMYn1MaBLW fH/UrCYtki3ldIQPer2mGye4mRmuMAhJxwdeaoMJb8TZqDGCQQj6c5BDwCp4zBAi/7/9 PtG6L/EQwOxVsS+3LFGgb7IxkD0bho1jggn5CQ1rP9VFmQo3DQZ+zu0jkorUbNpyDRR6 UUdw== X-Gm-Message-State: APjAAAUPPyJcSx6drVHs0/0MuKDzFDe0ffySgGv6kU1yWZD7GwX6T73f G+hMg54brtMkHnYGDOwbzsY6RpLyQj19G3d/dxwGXA== X-Google-Smtp-Source: APXvYqylkdRXn8ytxjn82v64hjOSfSFlhN3vERj+Ewj6i/wZHk0CJdLAV7WKj7ck6GdlxraoYRNlNbJncBsBlrSYCBg= X-Received: by 2002:a1f:8744:: with SMTP id j65mr18215285vkd.17.1559831431940; Thu, 06 Jun 2019 07:30:31 -0700 (PDT) MIME-Version: 1.0 References: <20190606095326.496591298@linutronix.de> <20190606100415.557432979@linutronix.de> In-Reply-To: From: Richard Fontana Date: Thu, 6 Jun 2019 10:30:20 -0400 Message-ID: Subject: Re: [COX patch 2/2] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 99 To: Steve Winslow Cc: Thomas Gleixner , 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 Thu, Jun 6, 2019 at 8:41 AM Steve Winslow wrote: > > 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. Agreed that the "Neither ..." paragraph should be retained. I don't have an opinion on the desirability of wrapping it in delimiters. Richard > > 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 -- Richard Fontana Senior Commercial Counsel Red Hat, Inc.