diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-23 18:13:07 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-23 18:13:07 +0300 |
| commit | 61686afe1ff378021da4e5509d081fb5196212d5 (patch) | |
| tree | 649ddd220ed5eec57680273e6a4c3c0f9f223cc7 /scripts | |
| parent | 54dee406374ce8adb352c48e175176247cb8db7c (diff) | |
| parent | a65fd4f0def56f59822b2c49522d36319bc8da8b (diff) | |
| download | linux-61686afe1ff378021da4e5509d081fb5196212d5.tar.xz | |
Merge tag 'docs-5.2-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet:
"A handful of fixes for a docs build problem, along with catching the
spdxcheck.py script up with the current state of affairs"
* tag 'docs-5.2-fixes' of git://git.lwn.net/linux:
Documentation: kdump: fix minor typo
scripts/spdxcheck.py: Add dual license subdirectory
scripts/spdxcheck.py: Fix path to deprecated licenses
counter: fix Documentation build error due to incorrect source file name
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/spdxcheck.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py index 4fe392e507fb..33df646618e2 100755 --- a/scripts/spdxcheck.py +++ b/scripts/spdxcheck.py @@ -32,7 +32,7 @@ class SPDXdata(object): def read_spdxdata(repo): # The subdirectories of LICENSES in the kernel source - license_dirs = [ "preferred", "other", "exceptions" ] + license_dirs = [ "preferred", "deprecated", "exceptions", "dual" ] lictree = repo.head.commit.tree['LICENSES'] spdx = SPDXdata() |