Reviewed-by: Allison Randal <allison@xxxxxxxxxxx> On 5/19/19 6:29 PM, J Lovejoy wrote: > Reviewed-by: Jilayne Lovejoy <opensource@xxxxxxxxxxx> > >> On May 19, 2019, at 7:51 AM, Thomas Gleixner <tglx@xxxxxxxxxxxxx> 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 of the license 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 the full >> gnu general public license is included in this distribution in the >> file called copying >> >> extracted by the scancode license scanner the SPDX license identifier >> >> GPL-2.0-or-later >> >> 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=step2&id=3e4bede30c57 >> --- >> drivers/dma/dmaengine.c | 14 +------------- >> drivers/dma/ioat/dma.h | 14 +------------- >> drivers/dma/ioat/hw.h | 14 +------------- >> drivers/dma/ioat/registers.h | 14 +------------- >> drivers/dma/mpc512x_dma.c | 14 +------------- >> drivers/dma/ppc4xx/adma.c | 14 +------------- >> drivers/platform/x86/toshiba_acpi.c | 14 +------------- >> drivers/rapidio/devices/tsi721_dma.c | 14 +------------- >> include/linux/dmaengine.h | 14 +------------- >> 9 files changed, 9 insertions(+), 117 deletions(-) >> >> --- a/drivers/dma/dmaengine.c >> +++ b/drivers/dma/dmaengine.c >> @@ -1,18 +1,6 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> /* >> * Copyright(c) 2004 - 2006 Intel Corporation. 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 of the License, 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. >> - * >> - * The full GNU General Public License is included in this distribution in the >> - * file called COPYING. >> */ >> >> /* >> --- a/drivers/dma/ioat/dma.h >> +++ b/drivers/dma/ioat/dma.h >> @@ -1,18 +1,6 @@ >> +/* SPDX-License-Identifier: GPL-2.0-or-later */ >> /* >> * Copyright(c) 2004 - 2009 Intel Corporation. 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 of the License, 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. >> - * >> - * The full GNU General Public License is included in this distribution in the >> - * file called COPYING. >> */ >> #ifndef IOATDMA_H >> #define IOATDMA_H >> --- a/drivers/dma/ioat/hw.h >> +++ b/drivers/dma/ioat/hw.h >> @@ -1,18 +1,6 @@ >> +/* SPDX-License-Identifier: GPL-2.0-or-later */ >> /* >> * Copyright(c) 2004 - 2009 Intel Corporation. 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 of the License, 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. >> - * >> - * The full GNU General Public License is included in this distribution in the >> - * file called COPYING. >> */ >> #ifndef _IOAT_HW_H_ >> #define _IOAT_HW_H_ >> --- a/drivers/dma/ioat/registers.h >> +++ b/drivers/dma/ioat/registers.h >> @@ -1,18 +1,6 @@ >> +/* SPDX-License-Identifier: GPL-2.0-or-later */ >> /* >> * Copyright(c) 2004 - 2009 Intel Corporation. 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 of the License, 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. >> - * >> - * The full GNU General Public License is included in this distribution in the >> - * file called COPYING. >> */ >> #ifndef _IOAT_REGISTERS_H_ >> #define _IOAT_REGISTERS_H_ >> --- a/drivers/dma/mpc512x_dma.c >> +++ b/drivers/dma/mpc512x_dma.c >> @@ -1,3 +1,4 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> /* >> * Copyright (C) Freescale Semicondutor, Inc. 2007, 2008. >> * Copyright (C) Semihalf 2009 >> @@ -11,19 +12,6 @@ >> * >> * Approved as OSADL project by a majority of OSADL members and funded >> * by OSADL membership fees in 2009; for details see www.osadl.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 of the License, 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. >> - * >> - * The full GNU General Public License is included in this distribution in the >> - * file called COPYING. >> */ >> >> /* >> --- a/drivers/dma/ppc4xx/adma.c >> +++ b/drivers/dma/ppc4xx/adma.c >> @@ -1,3 +1,4 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> /* >> * Copyright (C) 2006-2009 DENX Software Engineering. >> * >> @@ -5,19 +6,6 @@ >> * >> * Further porting to arch/powerpc by >> * Anatolij Gustschin <agust@xxxxxxx> >> - * >> - * 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. >> - * >> - * 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. >> - * >> - * The full GNU General Public License is included in this distribution in the >> - * file called COPYING. >> */ >> >> /* >> --- a/drivers/platform/x86/toshiba_acpi.c >> +++ b/drivers/platform/x86/toshiba_acpi.c >> @@ -1,3 +1,4 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> /* >> * toshiba_acpi.c - Toshiba Laptop ACPI Extras >> * >> @@ -6,19 +7,6 @@ >> * Copyright (C) 2010 Pierre Ducroquet >> * Copyright (C) 2014-2016 Azael Avalos >> * >> - * 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. >> - * >> - * 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. >> - * >> - * The full GNU General Public License is included in this distribution in >> - * the file called "COPYING". >> - * >> * The devolpment page for this driver is located at >> * http://memebeam.org/toys/ToshibaAcpiDriver. >> * >> --- a/drivers/rapidio/devices/tsi721_dma.c >> +++ b/drivers/rapidio/devices/tsi721_dma.c >> @@ -1,21 +1,9 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> /* >> * DMA Engine support for Tsi721 PCIExpress-to-SRIO bridge >> * >> * Copyright (c) 2011-2014 Integrated Device Technology, Inc. >> * Alexandre Bounine <alexandre.bounine@xxxxxxx> >> - * >> - * 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. >> - * >> - * 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. >> - * >> - * The full GNU General Public License is included in this distribution in the >> - * file called COPYING. >> */ >> >> #include <linux/io.h> >> --- a/include/linux/dmaengine.h >> +++ b/include/linux/dmaengine.h >> @@ -1,18 +1,6 @@ >> +/* SPDX-License-Identifier: GPL-2.0-or-later */ >> /* >> * Copyright(c) 2004 - 2006 Intel Corporation. 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 of the License, 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. >> - * >> - * The full GNU General Public License is included in this distribution in the >> - * file called COPYING. >> */ >> #ifndef LINUX_DMAENGINE_H >> #define LINUX_DMAENGINE_H >> >> >