Skip to content

Commit 61686af

Browse files
committed
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
2 parents 54dee40 + a65fd4f commit 61686af

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Documentation/driver-api/generic-counter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ for defining a counter device.
251251
.. kernel-doc:: include/linux/counter.h
252252
:internal:
253253

254-
.. kernel-doc:: drivers/counter/generic-counter.c
254+
.. kernel-doc:: drivers/counter/counter.c
255255
:export:
256256

257257
Implementation

Documentation/kdump/kdump.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ Notes on loading the dump-capture kernel:
410410
* Boot parameter "1" boots the dump-capture kernel into single-user
411411
mode without networking. If you want networking, use "3".
412412

413-
* We generally don' have to bring up a SMP kernel just to capture the
413+
* We generally don't have to bring up a SMP kernel just to capture the
414414
dump. Hence generally it is useful either to build a UP dump-capture
415415
kernel or specify maxcpus=1 option while loading dump-capture kernel.
416416
Note, though maxcpus always works, you had better replace it with

scripts/spdxcheck.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def __init__(self):
3232
def read_spdxdata(repo):
3333

3434
# The subdirectories of LICENSES in the kernel source
35-
license_dirs = [ "preferred", "other", "exceptions" ]
35+
license_dirs = [ "preferred", "deprecated", "exceptions", "dual" ]
3636
lictree = repo.head.commit.tree['LICENSES']
3737

3838
spdx = SPDXdata()

0 commit comments

Comments
 (0)