diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-21 22:33:38 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-21 22:33:38 +0300 |
commit | 2c1212de6f9794a7becba5f219fa6ce8a8222c90 (patch) | |
tree | 29cf1ad9d9f5a0d60be81798caeea028caca7ff8 /lib | |
parent | d53e860fd46f3d95c437bb67518f7374500de467 (diff) | |
parent | 7170066ecd289cd8560695b6f86ba8dc723b6505 (diff) | |
download | linux-2c1212de6f9794a7becba5f219fa6ce8a8222c90.tar.xz |
Merge tag 'spdx-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull SPDX update from Greg KH:
"Here is a series of patches that add SPDX tags to different kernel
files, based on two different things:
- SPDX entries are added to a bunch of files that we missed a year
ago that do not have any license information at all.
These were either missed because the tool saw the MODULE_LICENSE()
tag, or some EXPORT_SYMBOL tags, and got confused and thought the
file had a real license, or the files have been added since the
last big sweep, or they were Makefile/Kconfig files, which we
didn't touch last time.
- Add GPL-2.0-only or GPL-2.0-or-later tags to files where our scan
tools can determine the license text in the file itself. Where this
happens, the license text is removed, in order to cut down on the
700+ different ways we have in the kernel today, in a quest to get
rid of all of these.
These patches have been out for review on the linux-spdx@vger mailing
list, and while they were created by automatic tools, they were
hand-verified by a bunch of different people, all whom names are on
the patches are reviewers.
The reason for these "large" patches is if we were to continue to
progress at the current rate of change in the kernel, adding license
tags to individual files in different subsystems, we would be finished
in about 10 years at the earliest.
There will be more series of these types of patches coming over the
next few weeks as the tools and reviewers crunch through the more
"odd" variants of how to say "GPLv2" that developers have come up with
over the years, combined with other fun oddities (GPL + a BSD
disclaimer?) that are being unearthed, with the goal for the whole
kernel to be cleaned up.
These diffstats are not small, 3840 files are touched, over 10k lines
removed in just 24 patches"
* tag 'spdx-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (24 commits)
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 25
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 24
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 23
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 22
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 21
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 20
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 19
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 18
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 17
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 15
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 14
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 12
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 11
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 10
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 9
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 7
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 5
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 4
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 3
...
Diffstat (limited to 'lib')
52 files changed, 52 insertions, 2 deletions
diff --git a/lib/842/Makefile b/lib/842/Makefile index 5d24c0baff2e..6f7aad269288 100644 --- a/lib/842/Makefile +++ b/lib/842/Makefile @@ -1,2 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_842_COMPRESS) += 842_compress.o obj-$(CONFIG_842_DECOMPRESS) += 842_decompress.o diff --git a/lib/Kconfig b/lib/Kconfig index 8d9239a4156c..90623a0e1942 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Library configuration # diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index eae43952902e..cbdfae379896 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only menu "Kernel hacking" menu "printk and dmesg options" diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 9950b660e62d..4fafba1a923b 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # This config refers to the generic KASAN mode. config HAVE_ARCH_KASAN bool diff --git a/lib/Kconfig.kgdb b/lib/Kconfig.kgdb index ab4ff0eea776..bbe397df04a3 100644 --- a/lib/Kconfig.kgdb +++ b/lib/Kconfig.kgdb @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config HAVE_ARCH_KGDB bool diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan index a2ae4a8e4fa6..0e04fcb3ab3d 100644 --- a/lib/Kconfig.ubsan +++ b/lib/Kconfig.ubsan @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config ARCH_HAS_UBSAN_SANITIZE_ALL bool diff --git a/lib/bitrev.c b/lib/bitrev.c index 40ffda94cc5d..81b56e0a7f32 100644 --- a/lib/bitrev.c +++ b/lib/bitrev.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #ifndef CONFIG_HAVE_ARCH_BITREVERSE #include <linux/types.h> #include <linux/module.h> diff --git a/lib/debug_locks.c b/lib/debug_locks.c index ce51749cc145..a75ee30b77cb 100644 --- a/lib/debug_locks.c +++ b/lib/debug_locks.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * lib/debug_locks.c * diff --git a/lib/fault-inject.c b/lib/fault-inject.c index e26aa4f65eb9..3cb21b2bf088 100644 --- a/lib/fault-inject.c +++ b/lib/fault-inject.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/kernel.h> #include <linux/init.h> #include <linux/random.h> diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig index 3ecdd5204ec5..37baa79cdd71 100644 --- a/lib/fonts/Kconfig +++ b/lib/fonts/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Font configuration # diff --git a/lib/idr.c b/lib/idr.c index cb1db9b8d3f6..c34e256d2f01 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/bitmap.h> #include <linux/bug.h> #include <linux/export.h> diff --git a/lib/interval_tree.c b/lib/interval_tree.c index c85f6600a5f8..593ce56ece50 100644 --- a/lib/interval_tree.c +++ b/lib/interval_tree.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/interval_tree.h> #include <linux/interval_tree_generic.h> #include <linux/compiler.h> diff --git a/lib/interval_tree_test.c b/lib/interval_tree_test.c index 75509a1511a3..f37f4d44faa9 100644 --- a/lib/interval_tree_test.c +++ b/lib/interval_tree_test.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/interval_tree.h> diff --git a/lib/iov_iter.c b/lib/iov_iter.c index f74fa832f3aa..f99c41d4eb54 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/export.h> #include <linux/bvec.h> #include <linux/uio.h> diff --git a/lib/lz4/Makefile b/lib/lz4/Makefile index f7b113271d13..5b42242afaa2 100644 --- a/lib/lz4/Makefile +++ b/lib/lz4/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only ccflags-y += -O3 obj-$(CONFIG_LZ4_COMPRESS) += lz4_compress.o diff --git a/lib/lzo/Makefile b/lib/lzo/Makefile index f0f7d7ca2b83..2f58fafbbddd 100644 --- a/lib/lzo/Makefile +++ b/lib/lzo/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only lzo_compress-objs := lzo1x_compress.o lzo_decompress-objs := lzo1x_decompress_safe.o diff --git a/lib/lzo/lzo1x_compress.c b/lib/lzo/lzo1x_compress.c index a8ede77afe0d..ba16c08e8cb9 100644 --- a/lib/lzo/lzo1x_compress.c +++ b/lib/lzo/lzo1x_compress.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * LZO1X Compressor from LZO * diff --git a/lib/lzo/lzo1x_decompress_safe.c b/lib/lzo/lzo1x_decompress_safe.c index 9e07e9ef1aad..2717c7963acd 100644 --- a/lib/lzo/lzo1x_decompress_safe.c +++ b/lib/lzo/lzo1x_decompress_safe.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * LZO1X Decompressor from LZO * diff --git a/lib/math/Kconfig b/lib/math/Kconfig index 73bdf37178d1..15bd50d92308 100644 --- a/lib/math/Kconfig +++ b/lib/math/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config CORDIC tristate "CORDIC algorithm" help diff --git a/lib/math/Makefile b/lib/math/Makefile index 583bbfebfc09..be6909e943bd 100644 --- a/lib/math/Makefile +++ b/lib/math/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-y += div64.o gcd.o lcm.o int_pow.o int_sqrt.o reciprocal_div.o obj-$(CONFIG_CORDIC) += cordic.o diff --git a/lib/math/gcd.c b/lib/math/gcd.c index 7948ab27f0a4..e3b042214d1b 100644 --- a/lib/math/gcd.c +++ b/lib/math/gcd.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/kernel.h> #include <linux/gcd.h> #include <linux/export.h> diff --git a/lib/math/lcm.c b/lib/math/lcm.c index 03d7fcb420b5..6e0b2e736700 100644 --- a/lib/math/lcm.c +++ b/lib/math/lcm.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/compiler.h> #include <linux/gcd.h> #include <linux/export.h> diff --git a/lib/math/prime_numbers.c b/lib/math/prime_numbers.c index 550eec457c2e..052f5b727be7 100644 --- a/lib/math/prime_numbers.c +++ b/lib/math/prime_numbers.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #define pr_fmt(fmt) "prime numbers: " fmt "\n" #include <linux/module.h> diff --git a/lib/memory-notifier-error-inject.c b/lib/memory-notifier-error-inject.c index e6239bf0b0df..2c46dde59644 100644 --- a/lib/memory-notifier-error-inject.c +++ b/lib/memory-notifier-error-inject.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/kernel.h> #include <linux/module.h> #include <linux/memory.h> diff --git a/lib/netdev-notifier-error-inject.c b/lib/netdev-notifier-error-inject.c index 13e9c62e216f..bb930f279e90 100644 --- a/lib/netdev-notifier-error-inject.c +++ b/lib/netdev-notifier-error-inject.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/kernel.h> #include <linux/module.h> #include <linux/netdevice.h> diff --git a/lib/notifier-error-inject.c b/lib/notifier-error-inject.c index eb4a04afea80..3d2ba7cf83f4 100644 --- a/lib/notifier-error-inject.c +++ b/lib/notifier-error-inject.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/module.h> #include "notifier-error-inject.h" diff --git a/lib/of-reconfig-notifier-error-inject.c b/lib/of-reconfig-notifier-error-inject.c index 8dc79861758a..b26f16402a19 100644 --- a/lib/of-reconfig-notifier-error-inject.c +++ b/lib/of-reconfig-notifier-error-inject.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c index da54318d3b55..071a76c7bac0 100644 --- a/lib/percpu-refcount.c +++ b/lib/percpu-refcount.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #define pr_fmt(fmt) "%s: " fmt "\n", __func__ #include <linux/kernel.h> diff --git a/lib/percpu_test.c b/lib/percpu_test.c index 0b5d14dadd1a..4a3d70bbc1a0 100644 --- a/lib/percpu_test.c +++ b/lib/percpu_test.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/module.h> /* validate @native and @pcp counter values match @expected */ diff --git a/lib/plist.c b/lib/plist.c index d3bd8827186f..0d86ed7a76ac 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * lib/plist.c * @@ -14,8 +15,6 @@ * Simplifications of the original code by * Oleg Nesterov <oleg@tv-sign.ru> * - * Licensed under the FSF's GNU Public License v2 or later. - * * Based on simple lists (include/linux/list.h). * * This file contains the add / del functions which are considered to diff --git a/lib/pm-notifier-error-inject.c b/lib/pm-notifier-error-inject.c index c094b2dedc23..5d89f0d9099a 100644 --- a/lib/pm-notifier-error-inject.c +++ b/lib/pm-notifier-error-inject.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/kernel.h> #include <linux/module.h> #include <linux/suspend.h> diff --git a/lib/rbtree_test.c b/lib/rbtree_test.c index b7055b2a07d3..62b8ee92643d 100644 --- a/lib/rbtree_test.c +++ b/lib/rbtree_test.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/rbtree_augmented.h> diff --git a/lib/reed_solomon/Makefile b/lib/reed_solomon/Makefile index c3d7136827ed..ba9d7a3329eb 100644 --- a/lib/reed_solomon/Makefile +++ b/lib/reed_solomon/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # This is a modified version of reed solomon lib, # diff --git a/lib/sg_pool.c b/lib/sg_pool.c index d1c1e6388eaa..cff20df2695e 100644 --- a/lib/sg_pool.c +++ b/lib/sg_pool.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/module.h> #include <linux/scatterlist.h> #include <linux/mempool.h> diff --git a/lib/string_helpers.c b/lib/string_helpers.c index 29c490e5d478..4403e1924f73 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Helpers for formatting and printing strings * diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index d3a501f2a81a..51a98f7ee79e 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Test cases for printf facility. */ diff --git a/lib/test_debug_virtual.c b/lib/test_debug_virtual.c index bf864c73e462..b7cc0aaee173 100644 --- a/lib/test_debug_virtual.c +++ b/lib/test_debug_virtual.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/kernel.h> #include <linux/module.h> #include <linux/export.h> diff --git a/lib/test_firmware.c b/lib/test_firmware.c index 7222093ee00b..787c146eb485 100644 --- a/lib/test_firmware.c +++ b/lib/test_firmware.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * This module provides an interface to trigger and test firmware loading. * diff --git a/lib/test_hash.c b/lib/test_hash.c index cac20c5fb304..0ee40b4a56dd 100644 --- a/lib/test_hash.c +++ b/lib/test_hash.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Test cases for <linux/hash.h> and <linux/stringhash.h> * This just verifies that various ways of computing a hash diff --git a/lib/test_list_sort.c b/lib/test_list_sort.c index 5474f3f3e41d..1f017d3b610e 100644 --- a/lib/test_list_sort.c +++ b/lib/test_list_sort.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #define pr_fmt(fmt) "list_sort_test: " fmt #include <linux/kernel.h> diff --git a/lib/test_module.c b/lib/test_module.c index 319b66f1ff61..debd19e35198 100644 --- a/lib/test_module.c +++ b/lib/test_module.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * This module emits "Hello, world" on printk when loaded. * diff --git a/lib/test_printf.c b/lib/test_printf.c index 93da0a5000ec..944eb50f3862 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Test cases for printf facility. */ diff --git a/lib/test_sort.c b/lib/test_sort.c index 385c0ed5202f..52edbe10f2e5 100644 --- a/lib/test_sort.c +++ b/lib/test_sort.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/sort.h> #include <linux/slab.h> #include <linux/module.h> diff --git a/lib/test_string.c b/lib/test_string.c index 0fcdb82dca86..bf8def01ed20 100644 --- a/lib/test_string.c +++ b/lib/test_string.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/module.h> #include <linux/printk.h> #include <linux/slab.h> diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 2f003cfe340e..63937044c57d 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * linux/lib/vsprintf.c * diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig index 12d2d777f36b..22528743d4ce 100644 --- a/lib/xz/Kconfig +++ b/lib/xz/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config XZ_DEC tristate "XZ decompression support" select CRC32 diff --git a/lib/xz/Makefile b/lib/xz/Makefile index a7fa7693f0f3..fa6af814a8d1 100644 --- a/lib/xz/Makefile +++ b/lib/xz/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_XZ_DEC) += xz_dec.o xz_dec-y := xz_dec_syms.o xz_dec_stream.o xz_dec_lzma2.o xz_dec-$(CONFIG_XZ_DEC_BCJ) += xz_dec_bcj.o diff --git a/lib/zlib_deflate/Makefile b/lib/zlib_deflate/Makefile index 86275e3fdcbc..2622e03c0b94 100644 --- a/lib/zlib_deflate/Makefile +++ b/lib/zlib_deflate/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # This is a modified version of zlib, which does all memory # allocation ahead of time. diff --git a/lib/zlib_deflate/deflate_syms.c b/lib/zlib_deflate/deflate_syms.c index ccfe25f3920f..72fe4b73be53 100644 --- a/lib/zlib_deflate/deflate_syms.c +++ b/lib/zlib_deflate/deflate_syms.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * linux/lib/zlib_deflate/deflate_syms.c * diff --git a/lib/zlib_inflate/Makefile b/lib/zlib_inflate/Makefile index 49f8ce5774d2..27327d3e9f54 100644 --- a/lib/zlib_inflate/Makefile +++ b/lib/zlib_inflate/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # This is a modified version of zlib, which does all memory # allocation ahead of time. diff --git a/lib/zlib_inflate/inflate_syms.c b/lib/zlib_inflate/inflate_syms.c index 67329fe9907e..9720114c0672 100644 --- a/lib/zlib_inflate/inflate_syms.c +++ b/lib/zlib_inflate/inflate_syms.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * linux/lib/zlib_inflate/inflate_syms.c * diff --git a/lib/zstd/Makefile b/lib/zstd/Makefile index 7920cbbfeae9..f5d778e7e5c7 100644 --- a/lib/zstd/Makefile +++ b/lib/zstd/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_ZSTD_COMPRESS) += zstd_compress.o obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd_decompress.o |