Commit 61686afe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 54dee406 a65fd4f0

Documentation/driver-api/generic-counter.rst

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ for defining a counter device. 
.. kernel-doc:: include/linux/counter.h

   :internal:



.. kernel-doc:: drivers/counter/generic-counter.c

.. kernel-doc:: drivers/counter/counter.c

   :export:



Implementation

Documentation/kdump/kdump.txt

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ Notes on loading the dump-capture kernel: 
* Boot parameter "1" boots the dump-capture kernel into single-user

  mode without networking. If you want networking, use "3".



* We generally don' have to bring up a SMP kernel just to capture the

* We generally don't have to bring up a SMP kernel just to capture the

  dump. Hence generally it is useful either to build a UP dump-capture

  kernel or specify maxcpus=1 option while loading dump-capture kernel.

  Note, though maxcpus always works, you had better replace it with

scripts/spdxcheck.py

+1 −1
Original line number Diff line number Diff line
@@ -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()

CRA Git | Maintained and supported by SUSTech CRA and CCSE