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 E7ADFC282DD for ; Thu, 23 May 2019 12:07:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9711D21019 for ; Thu, 23 May 2019 12:07:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729361AbfEWMHO convert rfc822-to-8bit (ORCPT ); Thu, 23 May 2019 08:07:14 -0400 Received: from mail-vs1-f68.google.com ([209.85.217.68]:39104 "EHLO mail-vs1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728309AbfEWMHO (ORCPT ); Thu, 23 May 2019 08:07:14 -0400 Received: by mail-vs1-f68.google.com with SMTP id m1so3408032vsr.6 for ; Thu, 23 May 2019 05:07:12 -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:content-transfer-encoding; bh=xW92jfa0ShV2ohABFInVR8vwPMGusDQYRCNqRJ9zDiA=; b=S8K5XoHXn5FyBkhQ1Z7Kd7Lgy09Mys42dPLOxORm71rL9PMzSQzFVepTDqln6jEWG+ xO+sH/7ODZSrg3trIoAlmyZlkmtl61Vmt637cI7kizfHmfvhwvtIqVY2j3dZM9XE5Mvf KT4Mrb4vyZLme8LO5feyPZljscOxXINw6oIrWaFxdGXUln/YnaLgwyZvXbA7WU/BtZax 8AD7l79IgFbbglpMqzZSIPArFJRiOyPCTvIzZs+HUbZ8ZXNgP67FrEsTNWdOq67kHING BYsXNzqWauEFGaLGGRP2MKDMzOfrI3NCybMPNpUVhsnXEZaWEHMvjgtOE5k2AxqnqeO+ jQ9g== X-Gm-Message-State: APjAAAX0urM22qn8zzCc4m9WT9nMkU3X4Gz6wlrc8/e7MRj20XBtT+lY 8wh8B9G6sPFcysMRxe+3VRheOst6oNn0ERSsIcgNHA== X-Google-Smtp-Source: APXvYqyt4ET6xgNNp4O80niYDQQv2khtwEuy+z8MeIyxg6cAHfwrvnAvSl3XMEatBq241L7VkuZQibdtM6VAzOD8GWs= X-Received: by 2002:a67:ea0d:: with SMTP id g13mr743598vso.137.1558613231011; Thu, 23 May 2019 05:07:11 -0700 (PDT) MIME-Version: 1.0 References: <20190523091437.334232837@linutronix.de> <20190523091651.032047323@linutronix.de> In-Reply-To: <20190523091651.032047323@linutronix.de> From: Richard Fontana Date: Thu, 23 May 2019 08:06:59 -0400 Message-ID: Subject: Re: [Batch 5 - patch 18/25] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 118 To: Thomas Gleixner Cc: linux-spdx@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: linux-spdx-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spdx@vger.kernel.org Reviewed-by: Richard Fontana On Thu, May 23, 2019 at 5:29 AM Thomas Gleixner wrote: > > Based on 1 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 or at your option any > later version 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 > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-or-later > > has been chosen to replace the boilerplate/reference in 44 file(s). > > Signed-off-by: Thomas Gleixner > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch5&id=dc0b8ab31b8a > --- > arch/powerpc/platforms/cell/cell.h | 11 +---------- > arch/x86/include/asm/ist.h | 11 +---------- > arch/x86/kernel/apm_32.c | 11 +---------- > arch/x86/kernel/kgdb.c | 11 +---------- > drivers/ata/ahci_brcm.c | 11 +---------- > drivers/ata/pata_cs5520.c | 11 +---------- > drivers/ata/sata_sil24.c | 12 +----------- > drivers/cpufreq/powernv-cpufreq.c | 12 +----------- > drivers/hwmon/dell-smm-hwmon.c | 11 +---------- > drivers/macintosh/apm_emu.c | 13 +------------ > drivers/media/dvb-frontends/as102_fe.c | 11 +---------- > drivers/media/dvb-frontends/as102_fe.h | 11 +---------- > drivers/media/dvb-frontends/as102_fe_types.h | 11 +---------- > drivers/media/dvb-frontends/gp8psk-fe.h | 11 +---------- > drivers/media/usb/as102/as102_drv.c | 11 +---------- > drivers/media/usb/as102/as102_drv.h | 11 +---------- > drivers/media/usb/as102/as102_fw.c | 11 +---------- > drivers/media/usb/as102/as102_fw.h | 11 +---------- > drivers/media/usb/as102/as102_usb_drv.c | 11 +---------- > drivers/media/usb/as102/as102_usb_drv.h | 11 +---------- > drivers/media/usb/as102/as10x_cmd.c | 11 +---------- > drivers/media/usb/as102/as10x_cmd.h | 11 +---------- > drivers/media/usb/as102/as10x_cmd_cfg.c | 11 +---------- > drivers/media/usb/as102/as10x_cmd_stream.c | 11 +---------- > drivers/media/usb/as102/as10x_handle.h | 11 +---------- > drivers/misc/genwqe/card_ddcb.h | 11 +---------- > drivers/phy/broadcom/phy-brcm-sata.c | 11 +---------- > drivers/pnp/pnpacpi/rsparser.c | 11 +---------- > drivers/pwm/sysfs.c | 11 +---------- > drivers/scsi/aha152x.c | 13 +------------ > drivers/scsi/nsp32.c | 12 +----------- > drivers/scsi/nsp32.h | 11 +---------- > drivers/scsi/pcmcia/sym53c500_cs.c | 11 +---------- > drivers/scsi/qla1280.c | 11 +---------- > drivers/scsi/qla1280.h | 11 +---------- > drivers/scsi/wd33c93.c | 11 +---------- > drivers/scsi/wd33c93.h | 12 +----------- > fs/notify/dnotify/dnotify.c | 11 +---------- > fs/notify/inotify/inotify_fsnotify.c | 11 +---------- > fs/notify/inotify/inotify_user.c | 11 +---------- > fs/squashfs/zstd_wrapper.c | 11 +---------- > include/linux/apm_bios.h | 11 +---------- > include/linux/toshiba.h | 12 +----------- > sound/pci/cs5530.c | 11 +---------- > 44 files changed, 44 insertions(+), 449 deletions(-) > > --- a/arch/powerpc/platforms/cell/cell.h > +++ b/arch/powerpc/platforms/cell/cell.h > @@ -1,17 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Cell Platform common data structures > * > * Copyright 2015, Daniel Axtens, IBM 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; either version 2, or (at your option) > - * any later version. > - * > - * 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. > */ > > #ifndef CELL_H > --- a/arch/x86/include/asm/ist.h > +++ b/arch/x86/include/asm/ist.h > @@ -1,16 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Include file for the interface to IST BIOS > * Copyright 2002 Andy Grover > - * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > */ > #ifndef _ASM_X86_IST_H > #define _ASM_X86_IST_H > --- a/arch/x86/kernel/apm_32.c > +++ b/arch/x86/kernel/apm_32.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* -*- linux-c -*- > * APM BIOS driver for Linux > * Copyright 1994-2001 Stephen Rothwell (sfr@canb.auug.org.au) > @@ -5,16 +6,6 @@ > * Initial development of this driver was funded by NEC Australia P/L > * and NEC 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; either version 2, or (at your option) any > - * later version. > - * > - * 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. > - * > * October 1995, Rik Faith (faith@cs.unc.edu): > * Minor enhancements and updates (to the patch set) for 1.3.x > * Documentation > --- a/arch/x86/kernel/kgdb.c > +++ b/arch/x86/kernel/kgdb.c > @@ -1,14 +1,5 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > - * 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, or (at your option) any > - * later version. > - * > - * 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. > - * > */ > > /* > --- a/drivers/ata/ahci_brcm.c > +++ b/drivers/ata/ahci_brcm.c > @@ -1,17 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Broadcom SATA3 AHCI Controller Driver > * > * Copyright © 2009-2015 Broadcom 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; either version 2, or (at your option) > - * any later version. > - * > - * 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. > */ > > #include > --- a/drivers/ata/pata_cs5520.c > +++ b/drivers/ata/pata_cs5520.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * IDE tuning and bus mastering support for the CS5510/CS5520 > * chipsets > @@ -18,16 +19,6 @@ > * > * (c) Copyright Red Hat Inc 2002 > * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > - * > * Documentation: > * Not publicly available. > */ > --- a/drivers/ata/sata_sil24.c > +++ b/drivers/ata/sata_sil24.c > @@ -1,20 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * sata_sil24.c - Driver for Silicon Image 3124/3132 SATA-2 controllers > * > * Copyright 2005 Tejun Heo > * > * Based on preview driver from Silicon Image. > - * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > - * > */ > > #include > --- a/drivers/cpufreq/powernv-cpufreq.c > +++ b/drivers/cpufreq/powernv-cpufreq.c > @@ -1,20 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * POWERNV cpufreq driver for the IBM POWER processors > * > * (C) Copyright IBM 2014 > * > * Author: Vaidyanathan Srinivasan > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > - * > */ > > #define pr_fmt(fmt) "powernv-cpufreq: " fmt > --- a/drivers/hwmon/dell-smm-hwmon.c > +++ b/drivers/hwmon/dell-smm-hwmon.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * dell-smm-hwmon.c -- Linux driver for accessing the SMM BIOS on Dell laptops. > * > @@ -7,16 +8,6 @@ > * Copyright (C) 2011 Jean Delvare > * Copyright (C) 2013, 2014 Guenter Roeck > * Copyright (C) 2014, 2015 Pali Rohár > - * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > --- a/drivers/macintosh/apm_emu.c > +++ b/drivers/macintosh/apm_emu.c > @@ -1,19 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * APM emulation for PMU-based machines > * > * Copyright 2001 Benjamin Herrenschmidt (benh@kernel.crashing.org) > - * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > - * > - * > */ > > #include > --- a/drivers/media/dvb-frontends/as102_fe.c > +++ b/drivers/media/dvb-frontends/as102_fe.c > @@ -1,17 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > * Copyright (C) 2010 Devin Heitmueller > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #include > --- a/drivers/media/dvb-frontends/as102_fe.h > +++ b/drivers/media/dvb-frontends/as102_fe.h > @@ -1,16 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2014 Mauro Carvalho Chehab > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #include "as102_fe_types.h" > --- a/drivers/media/dvb-frontends/as102_fe_types.h > +++ b/drivers/media/dvb-frontends/as102_fe_types.h > @@ -1,16 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > #ifndef _AS10X_TYPES_H_ > #define _AS10X_TYPES_H_ > --- a/drivers/media/dvb-frontends/gp8psk-fe.h > +++ b/drivers/media/dvb-frontends/gp8psk-fe.h > @@ -1,15 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * gp8psk_fe driver > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #ifndef GP8PSK_FE_H > --- a/drivers/media/usb/as102/as102_drv.c > +++ b/drivers/media/usb/as102/as102_drv.c > @@ -1,17 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > * Copyright (C) 2010 Devin Heitmueller > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > #include > #include > --- a/drivers/media/usb/as102/as102_drv.h > +++ b/drivers/media/usb/as102/as102_drv.h > @@ -1,16 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #ifndef _AS102_DRV_H > --- a/drivers/media/usb/as102/as102_fw.c > +++ b/drivers/media/usb/as102/as102_fw.c > @@ -1,17 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > * Copyright (C) 2010 Devin Heitmueller > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > #include > #include > --- a/drivers/media/usb/as102/as102_fw.h > +++ b/drivers/media/usb/as102/as102_fw.h > @@ -1,16 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > #define MAX_FW_PKT_SIZE 64 > > --- a/drivers/media/usb/as102/as102_usb_drv.c > +++ b/drivers/media/usb/as102/as102_usb_drv.c > @@ -1,17 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > * Copyright (C) 2010 Devin Heitmueller > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > #include > #include > --- a/drivers/media/usb/as102/as102_usb_drv.h > +++ b/drivers/media/usb/as102/as102_usb_drv.h > @@ -1,17 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > * Copyright (C) 2010 Devin Heitmueller > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > #ifndef _AS102_USB_DRV_H_ > #define _AS102_USB_DRV_H_ > --- a/drivers/media/usb/as102/as10x_cmd.c > +++ b/drivers/media/usb/as102/as10x_cmd.c > @@ -1,17 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > * Copyright (C) 2010 Devin Heitmueller > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #include > --- a/drivers/media/usb/as102/as10x_cmd.h > +++ b/drivers/media/usb/as102/as10x_cmd.h > @@ -1,16 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > #ifndef _AS10X_CMD_H_ > #define _AS10X_CMD_H_ > --- a/drivers/media/usb/as102/as10x_cmd_cfg.c > +++ b/drivers/media/usb/as102/as10x_cmd_cfg.c > @@ -1,16 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #include > --- a/drivers/media/usb/as102/as10x_cmd_stream.c > +++ b/drivers/media/usb/as102/as10x_cmd_stream.c > @@ -1,16 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #include > --- a/drivers/media/usb/as102/as10x_handle.h > +++ b/drivers/media/usb/as102/as10x_handle.h > @@ -1,16 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Abilis Systems Single DVB-T Receiver > * Copyright (C) 2008 Pierrick Hascoet > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > #ifndef _AS10X_HANDLE_H > #define _AS10X_HANDLE_H > --- a/drivers/misc/genwqe/card_ddcb.h > +++ b/drivers/misc/genwqe/card_ddcb.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > #ifndef __CARD_DDCB_H__ > #define __CARD_DDCB_H__ > > @@ -10,16 +11,6 @@ > * Author: Joerg-Stephan Vogt > * Author: Michael Jung > * Author: Michael Ruettger > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #include > --- a/drivers/phy/broadcom/phy-brcm-sata.c > +++ b/drivers/phy/broadcom/phy-brcm-sata.c > @@ -1,17 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Broadcom SATA3 AHCI Controller PHY Driver > * > * Copyright (C) 2016 Broadcom > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #include > --- a/drivers/pnp/pnpacpi/rsparser.c > +++ b/drivers/pnp/pnpacpi/rsparser.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * pnpacpi -- PnP ACPI driver > * > @@ -5,16 +6,6 @@ > * Copyright (c) 2004 Li Shaohua > * Copyright (C) 2008 Hewlett-Packard Development Company, L.P. > * Bjorn Helgaas > - * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > */ > #include > #include > --- a/drivers/pwm/sysfs.c > +++ b/drivers/pwm/sysfs.c > @@ -1,19 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * A simple sysfs interface for the generic PWM framework > * > * Copyright (C) 2013 H Hartley Sweeten > * > * Based on previous work by Lars Poeschel > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #include > --- a/drivers/scsi/aha152x.c > +++ b/drivers/scsi/aha152x.c > @@ -1,18 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* aha152x.c -- Adaptec AHA-152x driver > * Author: Jürgen E. Fischer, fischer@norbit.de > * Copyright 1993-2004 Jürgen E. Fischer > * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > - * > - * > * $Id: aha152x.c,v 2.7 2004/01/24 11:42:59 fischer Exp $ > * > * $Log: aha152x.c,v $ > @@ -228,7 +218,6 @@ > * Revision 0.0 1993/08/14 19:54:25 root > * empty function bodies; detect() works. > * > - * > ************************************************************************** > > see Documentation/scsi/aha152x.txt for configuration details > --- a/drivers/scsi/nsp32.c > +++ b/drivers/scsi/nsp32.c > @@ -1,20 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * NinjaSCSI-32Bi Cardbus, NinjaSCSI-32UDE PCI/CardBus SCSI driver > * Copyright (C) 2001, 2002, 2003 > * YOKOTA Hiroshi > * GOTO Masanori , > * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > - * > - * > * Revision History: > * 1.0: Initial Release. > * 1.1: Add /proc SDTR status. > --- a/drivers/scsi/nsp32.h > +++ b/drivers/scsi/nsp32.h > @@ -1,16 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Workbit NinjaSCSI-32Bi/UDE PCI/CardBus SCSI Host Bus Adapter driver > * Basic data header > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > #ifndef _NSP32_H > --- a/drivers/scsi/pcmcia/sym53c500_cs.c > +++ b/drivers/scsi/pcmcia/sym53c500_cs.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * sym53c500_cs.c Bob Tracy (rct@frus.com) > * > @@ -25,16 +26,6 @@ > * Original by Tom Corner (tcorner@via.at) was adapted from a > * driver for the Qlogic SCSI card written by > * David Hinds (dhinds@allegro.stanford.edu). > -* > -* 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, or (at your option) any > -* later version. > -* > -* 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. > */ > > #define SYM53C500_DEBUG 0 > --- a/drivers/scsi/qla1280.c > +++ b/drivers/scsi/qla1280.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /****************************************************************************** > * QLOGIC LINUX SOFTWARE > * > @@ -6,16 +7,6 @@ > * Copyright (C) 2001-2004 Jes Sorensen, Wild Open Source Inc. > * Copyright (C) 2003-2004 Christoph Hellwig > * > -* 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, or (at your option) any > -* later version. > -* > -* 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. > -* > ******************************************************************************/ > #define QLA1280_VERSION "3.27.1" > /***************************************************************************** > --- a/drivers/scsi/qla1280.h > +++ b/drivers/scsi/qla1280.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /****************************************************************************** > * QLOGIC LINUX SOFTWARE > * > @@ -5,16 +6,6 @@ > * Copyright (C) 2000 Qlogic Corporation > * (www.qlogic.com) > * > -* 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, or (at your option) any > -* later version. > -* > -* 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. > -* > ******************************************************************************/ > > #ifndef _QLA1280_H > --- a/drivers/scsi/wd33c93.c > +++ b/drivers/scsi/wd33c93.c > @@ -1,17 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 1996 John Shifflett, GeoLog Consulting > * john@geolog.com > * jshiffle@netcom.com > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > */ > > /* > --- a/drivers/scsi/wd33c93.h > +++ b/drivers/scsi/wd33c93.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * wd33c93.h - Linux device driver definitions for the > * Commodore Amiga A2091/590 SCSI controller card > @@ -7,17 +8,6 @@ > * Copyright (c) 1996 John Shifflett, GeoLog Consulting > * john@geolog.com > * jshiffle@netcom.com > - * > - * 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, or (at your option) > - * any later version. > - * > - * 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. > - * > */ > #ifndef WD33C93_H > #define WD33C93_H > --- a/fs/notify/dnotify/dnotify.c > +++ b/fs/notify/dnotify/dnotify.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Directory notifications for Linux. > * > @@ -5,16 +6,6 @@ > * > * Copyright (C) 2009 Eric Paris > * dnotify was largly rewritten to use the new fsnotify infrastructure > - * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > */ > #include > #include > --- a/fs/notify/inotify/inotify_fsnotify.c > +++ b/fs/notify/inotify/inotify_fsnotify.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * fs/inotify_user.c - inotify support for userspace > * > @@ -10,16 +11,6 @@ > * > * Copyright (C) 2009 Eric Paris > * inotify was largely rewriten to make use of the fsnotify infrastructure > - * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > */ > > #include /* d_unlinked */ > --- a/fs/notify/inotify/inotify_user.c > +++ b/fs/notify/inotify/inotify_user.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * fs/inotify_user.c - inotify support for userspace > * > @@ -10,16 +11,6 @@ > * > * Copyright (C) 2009 Eric Paris > * inotify was largely rewriten to make use of the fsnotify infrastructure > - * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > */ > > #include > --- a/fs/squashfs/zstd_wrapper.c > +++ b/fs/squashfs/zstd_wrapper.c > @@ -1,19 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Squashfs - a compressed read only filesystem for Linux > * > * Copyright (c) 2016-present, Facebook, Inc. > * All rights reserved. > * > - * 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, > - * or (at your option) any later version. > - * > - * 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. > - * > * zstd_wrapper.c > */ > > --- a/include/linux/apm_bios.h > +++ b/include/linux/apm_bios.h > @@ -1,16 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Include file for the interface to an APM BIOS > * Copyright 1994-2001 Stephen Rothwell (sfr@canb.auug.org.au) > - * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > */ > #ifndef _LINUX_APM_H > #define _LINUX_APM_H > --- a/include/linux/toshiba.h > +++ b/include/linux/toshiba.h > @@ -1,20 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* toshiba.h -- Linux driver for accessing the SMM on Toshiba laptops > * > * Copyright (c) 1996-2000 Jonathan A. Buzzard (jonathan@buzzard.org.uk) > * > * Thanks to Juergen Heinzl for the pointers > * on making sure the structure is aligned and packed. > - * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > - * > */ > #ifndef _LINUX_TOSHIBA_H > #define _LINUX_TOSHIBA_H > --- a/sound/pci/cs5530.c > +++ b/sound/pci/cs5530.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio > * > @@ -21,16 +22,6 @@ > * Thanks to National Semiconductor for providing the needed information > * on the XpressAudio(tm) internals. > * > - * 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, or (at your option) any > - * later version. > - * > - * 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. > - * > * TO DO: > * Investigate whether we can portably support Cognac (5520) in the > * same manner. > > -- Richard Fontana Senior Commercial Counsel Red Hat, Inc.