UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

A handful of fixes for a docs build problem, along with catching the 

spdxcheck.py script up with the current state of affairs.
 -----BEGIN PGP SIGNATURE-----
 
 iQFDBAABCAAtFiEEIw+MvkEiF49krdp9F0NaE2wMflgFAlzmskAPHGNvcmJldEBs
 d24ubmV0AAoJEBdDWhNsDH5Yc2YIAIakPFL8HH9HAPiuhrQnL78vU06pRwqk19sc
 ovEtwWBr6gxLcqa4oL0opatElmUmoYvRN0ZaPdYZRgCWZSpUAzzNVJgMDPjeDbIK
 aE8vfN8DzqHtT3MDNrLAlP2zK9s3srE1GovnmJgtScSOE5bS3cQumeM8qhoz6zWG
 p8tDyB9LxUaZb3RiEGukgYqciNwoy3e/V/5lkfCm7Yv6gByzyQLVov79N9XsLB5g
 Is8skZEfdNqjFYNPOAyPN2lFTCSzyT1Wkl2GwvZ3EPZCNHLlnj2NpyfZuGjMFaMK
 zyM0vypPPrN8Qnubd3vWPw0r0gNW4nCcfZRelkjRR9+TYGGEGus=
 =gh2E
 -----END PGP SIGNATURE-----

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
parent 54dee40637 a65fd4f0de
commit 61686afe1f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/driver-api/generic-counter.rst
View File

@ -251,7 +251,7 @@ for defining a counter device.
.. kernel-doc:: include/linux/counter.h .. kernel-doc:: include/linux/counter.h
:internal: :internal:
.. kernel-doc:: drivers/counter/generic-counter.c .. kernel-doc:: drivers/counter/counter.c
:export: :export:
Implementation Implementation

2
Documentation/kdump/kdump.txt
View File

@ -410,7 +410,7 @@ Notes on loading the dump-capture kernel:
* Boot parameter "1" boots the dump-capture kernel into single-user * Boot parameter "1" boots the dump-capture kernel into single-user
mode without networking. If you want networking, use "3". 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 dump. Hence generally it is useful either to build a UP dump-capture
kernel or specify maxcpus=1 option while loading dump-capture kernel. kernel or specify maxcpus=1 option while loading dump-capture kernel.
Note, though maxcpus always works, you had better replace it with Note, though maxcpus always works, you had better replace it with

2
scripts/spdxcheck.py
View File

@ -32,7 +32,7 @@ class SPDXdata(object):
def read_spdxdata(repo): def read_spdxdata(repo):
# The subdirectories of LICENSES in the kernel source # 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'] lictree = repo.head.commit.tree['LICENSES']
spdx = SPDXdata() spdx = SPDXdata()