diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-05-22 03:51:29 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-24 11:37:52 -0400 |
commit | d691005856b059758b0d2d8454c2a6b251def18d (patch) | |
tree | 9e3b168926b642d165b6ccde8701f3df4ccf3e07 | |
parent | 9ff554e9be1f78d47cc77ad563e57e6c0612dbb3 (diff) |
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 83
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@linutronix.de>
Reviewed-by: Richard Fontana <rfontana@redhat.com>
Reviewed-by: Allison Randal <allison@lohutok.net>
Reviewed-by: Armijn Hemel <armijn@tjaldur.nl>
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Cc: linux-spdx@vger.kernel.org
Link: https://lkml.kernel.org/r/20190520075211.321157221@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | arch/x86/boot/bioscall.S | 5 | ||||
-rw-r--r-- | arch/x86/boot/mkcpustr.c | 5 | ||||
-rw-r--r-- | arch/x86/boot/regs.c | 5 | ||||
-rw-r--r-- | fs/autofs/autofs_i.h | 5 | ||||
-rw-r--r-- | fs/autofs/dev-ioctl.c | 5 | ||||
-rw-r--r-- | fs/autofs/expire.c | 5 | ||||
-rw-r--r-- | fs/autofs/init.c | 5 | ||||
-rw-r--r-- | fs/autofs/inode.c | 5 | ||||
-rw-r--r-- | fs/autofs/root.c | 5 | ||||
-rw-r--r-- | fs/autofs/symlink.c | 5 | ||||
-rw-r--r-- | fs/autofs/waitq.c | 5 | ||||
-rw-r--r-- | fs/devpts/inode.c | 5 | ||||
-rw-r--r-- | include/linux/auto_dev-ioctl.h | 5 | ||||
-rw-r--r-- | include/linux/auto_fs.h | 5 | ||||
-rw-r--r-- | include/linux/devpts_fs.h | 5 | ||||
-rw-r--r-- | include/linux/jbd2.h | 5 | ||||
-rw-r--r-- | lib/raid6/mktables.c | 5 | ||||
-rw-r--r-- | lib/raid6/test/test.c | 5 |
18 files changed, 18 insertions, 72 deletions
diff --git a/arch/x86/boot/bioscall.S b/arch/x86/boot/bioscall.S index d401b4a262b0..5521ea12f44e 100644 --- a/arch/x86/boot/bioscall.S +++ b/arch/x86/boot/bioscall.S | |||
@@ -1,11 +1,8 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
1 | /* ----------------------------------------------------------------------- | 2 | /* ----------------------------------------------------------------------- |
2 | * | 3 | * |
3 | * Copyright 2009-2014 Intel Corporation; author H. Peter Anvin | 4 | * Copyright 2009-2014 Intel Corporation; author H. Peter Anvin |
4 | * | 5 | * |
5 | * This file is part of the Linux kernel, and is made available under | ||
6 | * the terms of the GNU General Public License version 2 or (at your | ||
7 | * option) any later version; incorporated herein by reference. | ||
8 | * | ||
9 | * ----------------------------------------------------------------------- */ | 6 | * ----------------------------------------------------------------------- */ |
10 | 7 | ||
11 | /* | 8 | /* |
diff --git a/arch/x86/boot/mkcpustr.c b/arch/x86/boot/mkcpustr.c index f72498dc90d2..9caa10e82217 100644 --- a/arch/x86/boot/mkcpustr.c +++ b/arch/x86/boot/mkcpustr.c | |||
@@ -1,11 +1,8 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* ----------------------------------------------------------------------- * | 2 | /* ----------------------------------------------------------------------- * |
2 | * | 3 | * |
3 | * Copyright 2008 rPath, Inc. - All Rights Reserved | 4 | * Copyright 2008 rPath, Inc. - All Rights Reserved |
4 | * | 5 | * |
5 | * This file is part of the Linux kernel, and is made available under | ||
6 | * the terms of the GNU General Public License version 2 or (at your | ||
7 | * option) any later version; incorporated herein by reference. | ||
8 | * | ||
9 | * ----------------------------------------------------------------------- */ | 6 | * ----------------------------------------------------------------------- */ |
10 | 7 | ||
11 | /* | 8 | /* |
diff --git a/arch/x86/boot/regs.c b/arch/x86/boot/regs.c index 2fe3616ba161..55de6b3092b8 100644 --- a/arch/x86/boot/regs.c +++ b/arch/x86/boot/regs.c | |||
@@ -1,11 +1,8 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* ----------------------------------------------------------------------- | 2 | /* ----------------------------------------------------------------------- |
2 | * | 3 | * |
3 | * Copyright 2009 Intel Corporation; author H. Peter Anvin | 4 | * Copyright 2009 Intel Corporation; author H. Peter Anvin |
4 | * | 5 | * |
5 | * This file is part of the Linux kernel, and is made available under | ||
6 | * the terms of the GNU General Public License version 2 or (at your | ||
7 | * option) any later version; incorporated herein by reference. | ||
8 | * | ||
9 | * ----------------------------------------------------------------------- */ | 6 | * ----------------------------------------------------------------------- */ |
10 | 7 | ||
11 | /* | 8 | /* |
diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h index e1091312abe1..8c0c11181fad 100644 --- a/fs/autofs/autofs_i.h +++ b/fs/autofs/autofs_i.h | |||
@@ -1,10 +1,7 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
1 | /* | 2 | /* |
2 | * Copyright 1997-1998 Transmeta Corporation - All Rights Reserved | 3 | * Copyright 1997-1998 Transmeta Corporation - All Rights Reserved |
3 | * Copyright 2005-2006 Ian Kent <raven@themaw.net> | 4 | * Copyright 2005-2006 Ian Kent <raven@themaw.net> |
4 | * | ||
5 | * This file is part of the Linux kernel and is made available under | ||
6 | * the terms of the GNU General Public License, version 2, or at your | ||
7 | * option, any later version, incorporated herein by reference. | ||
8 | */ | 5 | */ |
9 | 6 | ||
10 | /* Internal header file for autofs */ | 7 | /* Internal header file for autofs */ |
diff --git a/fs/autofs/dev-ioctl.c b/fs/autofs/dev-ioctl.c index e9fe74d1541b..a3cdb0036c5d 100644 --- a/fs/autofs/dev-ioctl.c +++ b/fs/autofs/dev-ioctl.c | |||
@@ -1,10 +1,7 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* | 2 | /* |
2 | * Copyright 2008 Red Hat, Inc. All rights reserved. | 3 | * Copyright 2008 Red Hat, Inc. All rights reserved. |
3 | * Copyright 2008 Ian Kent <raven@themaw.net> | 4 | * Copyright 2008 Ian Kent <raven@themaw.net> |
4 | * | ||
5 | * This file is part of the Linux kernel and is made available under | ||
6 | * the terms of the GNU General Public License, version 2, or at your | ||
7 | * option, any later version, incorporated herein by reference. | ||
8 | */ | 5 | */ |
9 | 6 | ||
10 | #include <linux/miscdevice.h> | 7 | #include <linux/miscdevice.h> |
diff --git a/fs/autofs/expire.c b/fs/autofs/expire.c index 28d9c2b1b3bb..cdff0567aacb 100644 --- a/fs/autofs/expire.c +++ b/fs/autofs/expire.c | |||
@@ -1,11 +1,8 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* | 2 | /* |
2 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved | 3 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved |
3 | * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org> | 4 | * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org> |
4 | * Copyright 2001-2006 Ian Kent <raven@themaw.net> | 5 | * Copyright 2001-2006 Ian Kent <raven@themaw.net> |
5 | * | ||
6 | * This file is part of the Linux kernel and is made available under | ||
7 | * the terms of the GNU General Public License, version 2, or at your | ||
8 | * option, any later version, incorporated herein by reference. | ||
9 | */ | 6 | */ |
10 | 7 | ||
11 | #include "autofs_i.h" | 8 | #include "autofs_i.h" |
diff --git a/fs/autofs/init.c b/fs/autofs/init.c index c0c1db2cc6ea..d3f55e874338 100644 --- a/fs/autofs/init.c +++ b/fs/autofs/init.c | |||
@@ -1,9 +1,6 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* | 2 | /* |
2 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved | 3 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved |
3 | * | ||
4 | * This file is part of the Linux kernel and is made available under | ||
5 | * the terms of the GNU General Public License, version 2, or at your | ||
6 | * option, any later version, incorporated herein by reference. | ||
7 | */ | 4 | */ |
8 | 5 | ||
9 | #include <linux/module.h> | 6 | #include <linux/module.h> |
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c index fb0225f21c12..9edf243713eb 100644 --- a/fs/autofs/inode.c +++ b/fs/autofs/inode.c | |||
@@ -1,10 +1,7 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* | 2 | /* |
2 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved | 3 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved |
3 | * Copyright 2005-2006 Ian Kent <raven@themaw.net> | 4 | * Copyright 2005-2006 Ian Kent <raven@themaw.net> |
4 | * | ||
5 | * This file is part of the Linux kernel and is made available under | ||
6 | * the terms of the GNU General Public License, version 2, or at your | ||
7 | * option, any later version, incorporated herein by reference. | ||
8 | */ | 5 | */ |
9 | 6 | ||
10 | #include <linux/seq_file.h> | 7 | #include <linux/seq_file.h> |
diff --git a/fs/autofs/root.c b/fs/autofs/root.c index 1246f396bf0e..e646569c75ed 100644 --- a/fs/autofs/root.c +++ b/fs/autofs/root.c | |||
@@ -1,11 +1,8 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* | 2 | /* |
2 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved | 3 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved |
3 | * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org> | 4 | * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org> |
4 | * Copyright 2001-2006 Ian Kent <raven@themaw.net> | 5 | * Copyright 2001-2006 Ian Kent <raven@themaw.net> |
5 | * | ||
6 | * This file is part of the Linux kernel and is made available under | ||
7 | * the terms of the GNU General Public License, version 2, or at your | ||
8 | * option, any later version, incorporated herein by reference. | ||
9 | */ | 6 | */ |
10 | 7 | ||
11 | #include <linux/capability.h> | 8 | #include <linux/capability.h> |
diff --git a/fs/autofs/symlink.c b/fs/autofs/symlink.c index aad3902c0cc1..7ac67dc76039 100644 --- a/fs/autofs/symlink.c +++ b/fs/autofs/symlink.c | |||
@@ -1,9 +1,6 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* | 2 | /* |
2 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved | 3 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved |
3 | * | ||
4 | * This file is part of the Linux kernel and is made available under | ||
5 | * the terms of the GNU General Public License, version 2, or at your | ||
6 | * option, any later version, incorporated herein by reference. | ||
7 | */ | 4 | */ |
8 | 5 | ||
9 | #include "autofs_i.h" | 6 | #include "autofs_i.h" |
diff --git a/fs/autofs/waitq.c b/fs/autofs/waitq.c index 15a3e31d0904..b04c528b19d3 100644 --- a/fs/autofs/waitq.c +++ b/fs/autofs/waitq.c | |||
@@ -1,10 +1,7 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* | 2 | /* |
2 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved | 3 | * Copyright 1997-1998 Transmeta Corporation -- All Rights Reserved |
3 | * Copyright 2001-2006 Ian Kent <raven@themaw.net> | 4 | * Copyright 2001-2006 Ian Kent <raven@themaw.net> |
4 | * | ||
5 | * This file is part of the Linux kernel and is made available under | ||
6 | * the terms of the GNU General Public License, version 2, or at your | ||
7 | * option, any later version, incorporated herein by reference. | ||
8 | */ | 5 | */ |
9 | 6 | ||
10 | #include <linux/sched/signal.h> | 7 | #include <linux/sched/signal.h> |
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 553a3f3300ae..2c14ae044dce 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c | |||
@@ -1,13 +1,10 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* -*- linux-c -*- --------------------------------------------------------- * | 2 | /* -*- linux-c -*- --------------------------------------------------------- * |
2 | * | 3 | * |
3 | * linux/fs/devpts/inode.c | 4 | * linux/fs/devpts/inode.c |
4 | * | 5 | * |
5 | * Copyright 1998-2004 H. Peter Anvin -- All Rights Reserved | 6 | * Copyright 1998-2004 H. Peter Anvin -- All Rights Reserved |
6 | * | 7 | * |
7 | * This file is part of the Linux kernel and is made available under | ||
8 | * the terms of the GNU General Public License, version 2, or at your | ||
9 | * option, any later version, incorporated herein by reference. | ||
10 | * | ||
11 | * ------------------------------------------------------------------------- */ | 8 | * ------------------------------------------------------------------------- */ |
12 | 9 | ||
13 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 10 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
diff --git a/include/linux/auto_dev-ioctl.h b/include/linux/auto_dev-ioctl.h index 28c15050ebe6..6e1ca6f95f80 100644 --- a/include/linux/auto_dev-ioctl.h +++ b/include/linux/auto_dev-ioctl.h | |||
@@ -1,10 +1,7 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
1 | /* | 2 | /* |
2 | * Copyright 2008 Red Hat, Inc. All rights reserved. | 3 | * Copyright 2008 Red Hat, Inc. All rights reserved. |
3 | * Copyright 2008 Ian Kent <raven@themaw.net> | 4 | * Copyright 2008 Ian Kent <raven@themaw.net> |
4 | * | ||
5 | * This file is part of the Linux kernel and is made available under | ||
6 | * the terms of the GNU General Public License, version 2, or at your | ||
7 | * option, any later version, incorporated herein by reference. | ||
8 | */ | 5 | */ |
9 | 6 | ||
10 | #ifndef _LINUX_AUTO_DEV_IOCTL_H | 7 | #ifndef _LINUX_AUTO_DEV_IOCTL_H |
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h index b8f814c95cf5..893f952ca40c 100644 --- a/include/linux/auto_fs.h +++ b/include/linux/auto_fs.h | |||
@@ -1,9 +1,6 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
1 | /* | 2 | /* |
2 | * Copyright 1997 Transmeta Corporation - All Rights Reserved | 3 | * Copyright 1997 Transmeta Corporation - All Rights Reserved |
3 | * | ||
4 | * This file is part of the Linux kernel and is made available under | ||
5 | * the terms of the GNU General Public License, version 2, or at your | ||
6 | * option, any later version, incorporated herein by reference. | ||
7 | */ | 4 | */ |
8 | 5 | ||
9 | #ifndef _LINUX_AUTO_FS_H | 6 | #ifndef _LINUX_AUTO_FS_H |
diff --git a/include/linux/devpts_fs.h b/include/linux/devpts_fs.h index 100cb4343763..45f746a48dcd 100644 --- a/include/linux/devpts_fs.h +++ b/include/linux/devpts_fs.h | |||
@@ -1,13 +1,10 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
1 | /* -*- linux-c -*- --------------------------------------------------------- * | 2 | /* -*- linux-c -*- --------------------------------------------------------- * |
2 | * | 3 | * |
3 | * linux/include/linux/devpts_fs.h | 4 | * linux/include/linux/devpts_fs.h |
4 | * | 5 | * |
5 | * Copyright 1998-2004 H. Peter Anvin -- All Rights Reserved | 6 | * Copyright 1998-2004 H. Peter Anvin -- All Rights Reserved |
6 | * | 7 | * |
7 | * This file is part of the Linux kernel and is made available under | ||
8 | * the terms of the GNU General Public License, version 2, or at your | ||
9 | * option, any later version, incorporated herein by reference. | ||
10 | * | ||
11 | * ------------------------------------------------------------------------- */ | 8 | * ------------------------------------------------------------------------- */ |
12 | 9 | ||
13 | #ifndef _LINUX_DEVPTS_FS_H | 10 | #ifndef _LINUX_DEVPTS_FS_H |
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 6c9870e16b19..5c04181b7c6d 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h | |||
@@ -1,3 +1,4 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
1 | /* | 2 | /* |
2 | * linux/include/linux/jbd2.h | 3 | * linux/include/linux/jbd2.h |
3 | * | 4 | * |
@@ -5,10 +6,6 @@ | |||
5 | * | 6 | * |
6 | * Copyright 1998-2000 Red Hat, Inc --- All Rights Reserved | 7 | * Copyright 1998-2000 Red Hat, Inc --- All Rights Reserved |
7 | * | 8 | * |
8 | * This file is part of the Linux kernel and is made available under | ||
9 | * the terms of the GNU General Public License, version 2, or at your | ||
10 | * option, any later version, incorporated herein by reference. | ||
11 | * | ||
12 | * Definitions for transaction data structures for the buffer cache | 9 | * Definitions for transaction data structures for the buffer cache |
13 | * filesystem journaling support. | 10 | * filesystem journaling support. |
14 | */ | 11 | */ |
diff --git a/lib/raid6/mktables.c b/lib/raid6/mktables.c index e824d088f72c..9c485df1308f 100644 --- a/lib/raid6/mktables.c +++ b/lib/raid6/mktables.c | |||
@@ -1,11 +1,8 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* -*- linux-c -*- ------------------------------------------------------- * | 2 | /* -*- linux-c -*- ------------------------------------------------------- * |
2 | * | 3 | * |
3 | * Copyright 2002-2007 H. Peter Anvin - All Rights Reserved | 4 | * Copyright 2002-2007 H. Peter Anvin - All Rights Reserved |
4 | * | 5 | * |
5 | * This file is part of the Linux kernel, and is made available under | ||
6 | * the terms of the GNU General Public License version 2 or (at your | ||
7 | * option) any later version; incorporated herein by reference. | ||
8 | * | ||
9 | * ----------------------------------------------------------------------- */ | 6 | * ----------------------------------------------------------------------- */ |
10 | 7 | ||
11 | /* | 8 | /* |
diff --git a/lib/raid6/test/test.c b/lib/raid6/test/test.c index b07f4d8e6b03..a3cf071941ab 100644 --- a/lib/raid6/test/test.c +++ b/lib/raid6/test/test.c | |||
@@ -1,11 +1,8 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
1 | /* -*- linux-c -*- ------------------------------------------------------- * | 2 | /* -*- linux-c -*- ------------------------------------------------------- * |
2 | * | 3 | * |
3 | * Copyright 2002-2007 H. Peter Anvin - All Rights Reserved | 4 | * Copyright 2002-2007 H. Peter Anvin - All Rights Reserved |
4 | * | 5 | * |
5 | * This file is part of the Linux kernel, and is made available under | ||
6 | * the terms of the GNU General Public License version 2 or (at your | ||
7 | * option) any later version; incorporated herein by reference. | ||
8 | * | ||
9 | * ----------------------------------------------------------------------- */ | 6 | * ----------------------------------------------------------------------- */ |
10 | 7 | ||
11 | /* | 8 | /* |