Reviewed-by: Allison Randal <allison@xxxxxxxxxxx> On 5/22/19 3:51 AM, Thomas Gleixner wrote: > Based on 1 normalized pattern(s): > > this file is part of the linux kernel and is made available under > the terms of the gnu general public license version 2 or at your > option any later version incorporated herein by reference > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-or-later > > has been chosen to replace the boilerplate/reference in 18 file(s). > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch4&id=77241ca7be35 > --- > arch/x86/boot/bioscall.S | 5 +---- > arch/x86/boot/mkcpustr.c | 5 +---- > arch/x86/boot/regs.c | 5 +---- > fs/autofs/autofs_i.h | 5 +---- > fs/autofs/dev-ioctl.c | 5 +---- > fs/autofs/expire.c | 5 +---- > fs/autofs/init.c | 5 +---- > fs/autofs/inode.c | 5 +---- > fs/autofs/root.c | 5 +---- > fs/autofs/symlink.c | 5 +---- > fs/autofs/waitq.c | 5 +---- > fs/devpts/inode.c | 5 +---- > include/linux/auto_dev-ioctl.h | 5 +---- > include/linux/auto_fs.h | 5 +---- > include/linux/devpts_fs.h | 5 +---- > include/linux/jbd2.h | 5 +---- > lib/raid6/mktables.c | 5 +---- > lib/raid6/test/test.c | 5 +---- > 18 files changed, 18 insertions(+), 72 deletions(-) > > --- a/arch/x86/boot/bioscall.S > +++ b/arch/x86/boot/bioscall.S > @@ -1,11 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* ----------------------------------------------------------------------- > * > * Copyright 2009-2014 Intel Corporation; author H. Peter Anvin > * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2 or (at your > - * option) any later version; incorporated herein by reference. > - * > * ----------------------------------------------------------------------- */ > > /* > --- a/arch/x86/boot/mkcpustr.c > +++ b/arch/x86/boot/mkcpustr.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* ----------------------------------------------------------------------- * > * > * Copyright 2008 rPath, Inc. - All Rights Reserved > * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2 or (at your > - * option) any later version; incorporated herein by reference. > - * > * ----------------------------------------------------------------------- */ > > /* > --- a/arch/x86/boot/regs.c > +++ b/arch/x86/boot/regs.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* ----------------------------------------------------------------------- > * > * Copyright 2009 Intel Corporation; author H. Peter Anvin > * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2 or (at your > - * option) any later version; incorporated herein by reference. > - * > * ----------------------------------------------------------------------- */ > > /* > --- a/fs/autofs/autofs_i.h > +++ b/fs/autofs/autofs_i.h > @@ -1,10 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Copyright 1997-1998 Transmeta Corporation - All Rights Reserved > * Copyright 2005-2006 Ian Kent <raven@xxxxxxxxxx> > - * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > */ > > /* Internal header file for autofs */ > --- a/fs/autofs/dev-ioctl.c > +++ b/fs/autofs/dev-ioctl.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright 2008 Red Hat, Inc. All rights reserved. > * Copyright 2008 Ian Kent <raven@xxxxxxxxxx> > - * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > */ > > #include <linux/miscdevice.h> > --- a/fs/autofs/expire.c > +++ b/fs/autofs/expire.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved > * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@xxxxxxxx> > * Copyright 2001-2006 Ian Kent <raven@xxxxxxxxxx> > - * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > */ > > #include "autofs_i.h" > --- a/fs/autofs/init.c > +++ b/fs/autofs/init.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved > - * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > */ > > #include <linux/module.h> > --- a/fs/autofs/inode.c > +++ b/fs/autofs/inode.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved > * Copyright 2005-2006 Ian Kent <raven@xxxxxxxxxx> > - * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > */ > > #include <linux/seq_file.h> > --- a/fs/autofs/root.c > +++ b/fs/autofs/root.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved > * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@xxxxxxxx> > * Copyright 2001-2006 Ian Kent <raven@xxxxxxxxxx> > - * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > */ > > #include <linux/capability.h> > --- a/fs/autofs/symlink.c > +++ b/fs/autofs/symlink.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved > - * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > */ > > #include "autofs_i.h" > --- a/fs/autofs/waitq.c > +++ b/fs/autofs/waitq.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved > * Copyright 2001-2006 Ian Kent <raven@xxxxxxxxxx> > - * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > */ > > #include <linux/sched/signal.h> > --- a/fs/devpts/inode.c > +++ b/fs/devpts/inode.c > @@ -1,13 +1,10 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* -*- linux-c -*- --------------------------------------------------------- * > * > * linux/fs/devpts/inode.c > * > * Copyright 1998-2004 H. Peter Anvin -- All Rights Reserved > * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > - * > * ------------------------------------------------------------------------- */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > --- a/include/linux/auto_dev-ioctl.h > +++ b/include/linux/auto_dev-ioctl.h > @@ -1,10 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Copyright 2008 Red Hat, Inc. All rights reserved. > * Copyright 2008 Ian Kent <raven@xxxxxxxxxx> > - * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > */ > > #ifndef _LINUX_AUTO_DEV_IOCTL_H > --- a/include/linux/auto_fs.h > +++ b/include/linux/auto_fs.h > @@ -1,9 +1,6 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Copyright 1997 Transmeta Corporation - All Rights Reserved > - * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > */ > > #ifndef _LINUX_AUTO_FS_H > --- a/include/linux/devpts_fs.h > +++ b/include/linux/devpts_fs.h > @@ -1,13 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* -*- linux-c -*- --------------------------------------------------------- * > * > * linux/include/linux/devpts_fs.h > * > * Copyright 1998-2004 H. Peter Anvin -- All Rights Reserved > * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > - * > * ------------------------------------------------------------------------- */ > > #ifndef _LINUX_DEVPTS_FS_H > --- a/include/linux/jbd2.h > +++ b/include/linux/jbd2.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * linux/include/linux/jbd2.h > * > @@ -5,10 +6,6 @@ > * > * Copyright 1998-2000 Red Hat, Inc --- All Rights Reserved > * > - * This file is part of the Linux kernel and is made available under > - * the terms of the GNU General Public License, version 2, or at your > - * option, any later version, incorporated herein by reference. > - * > * Definitions for transaction data structures for the buffer cache > * filesystem journaling support. > */ > --- a/lib/raid6/mktables.c > +++ b/lib/raid6/mktables.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* -*- linux-c -*- ------------------------------------------------------- * > * > * Copyright 2002-2007 H. Peter Anvin - All Rights Reserved > * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2 or (at your > - * option) any later version; incorporated herein by reference. > - * > * ----------------------------------------------------------------------- */ > > /* > --- a/lib/raid6/test/test.c > +++ b/lib/raid6/test/test.c > @@ -1,11 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* -*- linux-c -*- ------------------------------------------------------- * > * > * Copyright 2002-2007 H. Peter Anvin - All Rights Reserved > * > - * This file is part of the Linux kernel, and is made available under > - * the terms of the GNU General Public License version 2 or (at your > - * option) any later version; incorporated herein by reference. > - * > * ----------------------------------------------------------------------- */ > > /* > >
