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
This commit is contained in:
Linus Torvalds
2019-05-23 08:13:07 -07:00
3 changed files with 3 additions and 3 deletions

View File

@@ -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()