Reviewed-by: Kate Stewart <kstewart@xxxxxxxxxxxxxxxxxxx> On Mon, May 20, 2019 at 12:10 PM 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 or at your option any > later version you should have received a copy of the gnu general > public license for example usr src linux copying if not write to the > free software foundation inc 675 mass ave cambridge ma 02139 usa > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-or-later > > has been chosen to replace the boilerplate/reference in 20 file(s). > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: linux-spdx@xxxxxxxxxxxxxxx > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch2&id=6db9aef3d74f > --- > arch/alpha/include/asm/xor.h | 10 +--------- > arch/ia64/include/asm/xor.h | 10 +--------- > arch/ia64/lib/xor.S | 10 +--------- > arch/sparc/include/asm/xor_32.h | 10 +--------- > arch/sparc/include/asm/xor_64.h | 10 +--------- > arch/x86/include/asm/xor.h | 10 +--------- > arch/x86/include/asm/xor_32.h | 10 +--------- > crypto/xor.c | 10 +--------- > drivers/ide/ide-pnp.c | 10 +--------- > drivers/md/md-faulty.c | 11 +---------- > drivers/md/md-linear.c | 9 +-------- > drivers/md/md-multipath.c | 10 +--------- > drivers/md/md.c | 9 +-------- > drivers/md/md.h | 9 +-------- > drivers/md/raid0.c | 9 +-------- > drivers/md/raid1.c | 10 +--------- > drivers/md/raid10.c | 11 +---------- > drivers/md/raid5.c | 10 +--------- > include/asm-generic/xor.h | 10 +--------- > include/linux/raid/md_u.h | 9 +-------- > 20 files changed, 20 insertions(+), 177 deletions(-) > > --- a/arch/alpha/include/asm/xor.h > +++ b/arch/alpha/include/asm/xor.h > @@ -1,16 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * include/asm-alpha/xor.h > * > * Optimized RAID-5 checksumming functions for alpha EV5 and EV6 > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > extern void xor_alpha_2(unsigned long, unsigned long *, unsigned long *); > --- a/arch/ia64/include/asm/xor.h > +++ b/arch/ia64/include/asm/xor.h > @@ -1,14 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Optimized RAID-5 checksumming functions for IA-64. > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > > --- a/arch/ia64/lib/xor.S > +++ b/arch/ia64/lib/xor.S > @@ -1,16 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * arch/ia64/lib/xor.S > * > * Optimized RAID-5 checksumming functions for IA-64. > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #include <asm/asmmacro.h> > --- a/arch/sparc/include/asm/xor_32.h > +++ b/arch/sparc/include/asm/xor_32.h > @@ -1,16 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * include/asm/xor.h > * > * Optimized RAID-5 checksumming functions for 32-bit Sparc. > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > /* > --- a/arch/sparc/include/asm/xor_64.h > +++ b/arch/sparc/include/asm/xor_64.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * include/asm/xor.h > * > @@ -7,15 +8,6 @@ > * > * Copyright (C) 1997, 1999 Jakub Jelinek (jj@xxxxxxxxxxxxxx) > * Copyright (C) 2006 David S. Miller <davem@xxxxxxxxxxxxx> > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #include <asm/spitfire.h> > --- a/arch/x86/include/asm/xor.h > +++ b/arch/x86/include/asm/xor.h > @@ -1,17 +1,9 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > #ifndef _ASM_X86_XOR_H > #define _ASM_X86_XOR_H > > /* > * Optimized RAID-5 checksumming functions for SSE. > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > /* > --- a/arch/x86/include/asm/xor_32.h > +++ b/arch/x86/include/asm/xor_32.h > @@ -1,17 +1,9 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > #ifndef _ASM_X86_XOR_32_H > #define _ASM_X86_XOR_32_H > > /* > * Optimized RAID-5 checksumming functions for MMX. > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > /* > --- a/crypto/xor.c > +++ b/crypto/xor.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * xor.c : Multiple Devices driver for Linux > * > @@ -5,15 +6,6 @@ > * Ingo Molnar, Matti Aarnio, Jakub Jelinek, Richard Henderson. > * > * Dispatch optimized RAID-5 checksumming functions. > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #define BH_TRACE 0 > --- a/drivers/ide/ide-pnp.c > +++ b/drivers/ide/ide-pnp.c > @@ -1,17 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * This file provides autodetection for ISA PnP IDE interfaces. > * It was tested with "ESS ES1868 Plug and Play AudioDrive" IDE interface. > * > * Copyright (C) 2000 Andrey Panin <pazke@xxxxxxxxx> > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #include <linux/init.h> > --- a/drivers/md/md-faulty.c > +++ b/drivers/md/md-faulty.c > @@ -1,19 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * faulty.c : Multiple Devices driver for Linux > * > * Copyright (C) 2004 Neil Brown > * > * fautly-device-simulator personality for md > - * > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > > --- a/drivers/md/md-linear.c > +++ b/drivers/md/md-linear.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > linear.c : Multiple Devices driver for Linux > Copyright (C) 1994-96 Marc ZYNGIER > @@ -6,14 +7,6 @@ > > Linear mode management functions. > > - 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. > - > - You should have received a copy of the GNU General Public License > - (for example /usr/src/linux/COPYING); if not, write to the Free > - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #include <linux/blkdev.h> > --- a/drivers/md/md-multipath.c > +++ b/drivers/md/md-multipath.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * multipath.c : Multiple Devices driver for Linux > * > @@ -8,15 +9,6 @@ > * MULTIPATH management functions. > * > * derived from raid1.c. > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #include <linux/blkdev.h> > --- a/drivers/md/md.c > +++ b/drivers/md/md.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > md.c : Multiple Devices driver for Linux > Copyright (C) 1998, 1999, 2000 Ingo Molnar > @@ -22,14 +23,6 @@ > - persistent bitmap code > Copyright (C) 2003-2004, Paul Clements, SteelEye Technology, Inc. > > - 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. > - > - You should have received a copy of the GNU General Public License > - (for example /usr/src/linux/COPYING); if not, write to the Free > - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > > Errors, Warnings, etc. > Please use: > --- a/drivers/md/md.h > +++ b/drivers/md/md.h > @@ -1,15 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > md.h : kernel internal structure of the Linux MD driver > Copyright (C) 1996-98 Ingo Molnar, Gadi Oxman > > - 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. > - > - You should have received a copy of the GNU General Public License > - (for example /usr/src/linux/COPYING); if not, write to the Free > - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #ifndef _MD_MD_H > --- a/drivers/md/raid0.c > +++ b/drivers/md/raid0.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > raid0.c : Multiple Devices driver for Linux > Copyright (C) 1994-96 Marc ZYNGIER > @@ -7,14 +8,6 @@ > > RAID-0 management functions. > > - 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. > - > - You should have received a copy of the GNU General Public License > - (for example /usr/src/linux/COPYING); if not, write to the Free > - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #include <linux/blkdev.h> > --- a/drivers/md/raid1.c > +++ b/drivers/md/raid1.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * raid1.c : Multiple Devices driver for Linux > * > @@ -20,15 +21,6 @@ > * > * Additions to bitmap code, (C) 2003-2004 Paul Clements, SteelEye Technology: > * - persistent bitmap code > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #include <linux/slab.h> > --- a/drivers/md/raid10.c > +++ b/drivers/md/raid10.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * raid10.c : Multiple Devices driver for Linux > * > @@ -6,16 +7,6 @@ > * RAID-10 support for md. > * > * Base on code in raid1.c. See raid1.c for further copyright information. > - * > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #include <linux/slab.h> > --- a/drivers/md/raid5.c > +++ b/drivers/md/raid5.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * raid5.c : Multiple Devices driver for Linux > * Copyright (C) 1996, 1997 Ingo Molnar, Miguel de Icaza, Gadi Oxman > @@ -7,15 +8,6 @@ > * RAID-4/5/6 management functions. > * Thanks to Penguin Computing for making the RAID-6 development possible > * by donating a test server! > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > /* > --- a/include/asm-generic/xor.h > +++ b/include/asm-generic/xor.h > @@ -1,16 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * include/asm-generic/xor.h > * > * Generic optimized RAID-5 checksumming functions. > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * (for example /usr/src/linux/COPYING); if not, write to the Free > - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #include <linux/prefetch.h> > --- a/include/linux/raid/md_u.h > +++ b/include/linux/raid/md_u.h > @@ -1,15 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > md_u.h : user <=> kernel API between Linux raidtools and RAID drivers > Copyright (C) 1998 Ingo Molnar > > - 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. > - > - You should have received a copy of the GNU General Public License > - (for example /usr/src/linux/COPYING); if not, write to the Free > - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > #ifndef _MD_U_H > #define _MD_U_H > > > >
