diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-21 12:33:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-21 12:33:38 -0700 |
commit | 2c1212de6f9794a7becba5f219fa6ce8a8222c90 (patch) | |
tree | 29cf1ad9d9f5a0d60be81798caeea028caca7ff8 /drivers/isdn | |
parent | d53e860fd46f3d95c437bb67518f7374500de467 (diff) | |
parent | 7170066ecd289cd8560695b6f86ba8dc723b6505 (diff) |
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 'drivers/isdn')
-rw-r--r-- | drivers/isdn/Kconfig | 1 | ||||
-rw-r--r-- | drivers/isdn/capi/Kconfig | 1 | ||||
-rw-r--r-- | drivers/isdn/divert/Makefile | 1 | ||||
-rw-r--r-- | drivers/isdn/gigaset/Kconfig | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/Kconfig | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/Makefile | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/Kconfig | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/Kconfig | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/Kconfig | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/teles_cs.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hysdn/Kconfig | 1 | ||||
-rw-r--r-- | drivers/isdn/hysdn/Makefile | 1 | ||||
-rw-r--r-- | drivers/isdn/i4l/Kconfig | 1 | ||||
-rw-r--r-- | drivers/isdn/isdnloop/Makefile | 1 | ||||
-rw-r--r-- | drivers/isdn/mISDN/Kconfig | 1 |
15 files changed, 15 insertions, 0 deletions
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index ef661acdda17..1ca4d70d198a 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # ISDN device configuration # diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig index 7641b3096ea6..abaadce376c5 100644 --- a/drivers/isdn/capi/Kconfig +++ b/drivers/isdn/capi/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config CAPI_TRACE bool "CAPI trace support" default y diff --git a/drivers/isdn/divert/Makefile b/drivers/isdn/divert/Makefile index dd4a202e0bc2..07684fe53537 100644 --- a/drivers/isdn/divert/Makefile +++ b/drivers/isdn/divert/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # Makefile for the dss1_divert ISDN module # Each configuration option enables a list of files. diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig index 83f62b8d82b5..fe41e9cfb672 100644 --- a/drivers/isdn/gigaset/Kconfig +++ b/drivers/isdn/gigaset/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only menuconfig ISDN_DRV_GIGASET tristate "Siemens Gigaset support" depends on TTY diff --git a/drivers/isdn/hardware/Kconfig b/drivers/isdn/hardware/Kconfig index 95c403088cce..0d609b5fcf01 100644 --- a/drivers/isdn/hardware/Kconfig +++ b/drivers/isdn/hardware/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # ISDN hardware drivers # diff --git a/drivers/isdn/hardware/Makefile b/drivers/isdn/hardware/Makefile index e503032b05a0..a43760a0a4f5 100644 --- a/drivers/isdn/hardware/Makefile +++ b/drivers/isdn/hardware/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # Makefile for the CAPI hardware drivers # Object files in subdirectories diff --git a/drivers/isdn/hardware/avm/Kconfig b/drivers/isdn/hardware/avm/Kconfig index b99b906ea9b1..81483db067bb 100644 --- a/drivers/isdn/hardware/avm/Kconfig +++ b/drivers/isdn/hardware/avm/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # ISDN AVM drivers # diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig index fda912b0833f..a7a34a85b970 100644 --- a/drivers/isdn/hardware/mISDN/Kconfig +++ b/drivers/isdn/hardware/mISDN/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Hardware for mISDN # diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 38cfc8baae19..43d98ccf5ff6 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only menu "Passive cards" diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c index b8dd14958757..bcc37e955622 100644 --- a/drivers/isdn/hisax/teles_cs.c +++ b/drivers/isdn/hisax/teles_cs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* $Id: teles_cs.c,v 1.1.2.2 2004/01/25 15:07:06 keil Exp $ */ /*====================================================================== diff --git a/drivers/isdn/hysdn/Kconfig b/drivers/isdn/hysdn/Kconfig index e86bc6583d71..1971ef850c9a 100644 --- a/drivers/isdn/hysdn/Kconfig +++ b/drivers/isdn/hysdn/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config HYSDN tristate "Hypercope HYSDN cards (Champ, Ergo, Metro) support (module only)" depends on m && PROC_FS && PCI diff --git a/drivers/isdn/hysdn/Makefile b/drivers/isdn/hysdn/Makefile index da63b636267d..e01f17f22ebb 100644 --- a/drivers/isdn/hysdn/Makefile +++ b/drivers/isdn/hysdn/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # Makefile for the hysdn ISDN device driver # Each configuration option enables a list of files. diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig index 68e54d9f2f53..caa1b52f06f7 100644 --- a/drivers/isdn/i4l/Kconfig +++ b/drivers/isdn/i4l/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Old ISDN4Linux config # diff --git a/drivers/isdn/isdnloop/Makefile b/drivers/isdn/isdnloop/Makefile index 317cd3c5b8ee..5ff4c0e09768 100644 --- a/drivers/isdn/isdnloop/Makefile +++ b/drivers/isdn/isdnloop/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # Makefile for the isdnloop ISDN device driver # Each configuration option enables a list of files. diff --git a/drivers/isdn/mISDN/Kconfig b/drivers/isdn/mISDN/Kconfig index c0730d5c734d..26cf0ac9c4ad 100644 --- a/drivers/isdn/mISDN/Kconfig +++ b/drivers/isdn/mISDN/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only # # modularer ISDN driver # |