tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'docs-5.9-2' of git://git.lwn.net/linux

Browse Source 
Pull documentation fixes from Jonathan Corbet:
 "A handful of obvious fixes that wandered in during the merge window"

* tag 'docs-5.9-2' of git://git.lwn.net/linux:
  Documentation/locking/locktypes: fix the typo
  doc/zh_CN: resolve undefined label warning in admin-guide index
  doc/zh_CN: fix title heading markup in admin-guide cpu-load
  docs: remove the 2.6 "Upgrading I2C Drivers" guide
  docs: Correct the release date of 5.2 stable
  mailmap: Update comments for with format and more detalis
  docs: cdrom: Fix a typo and rst markup
  Doc: admin-guide: use correct legends in kernel-parameters.txt
  Documentation/features: refresh RISC-V arch support files
  documentation: coccinelle: Improve command example for make C={1,2}
  Core-api: Documentation: Replace deprecated :c:func: Usage
  Dev-tools: Documentation: Replace deprecated :c:func: Usage
  Filesystems: Documentation: Replace deprecated :c:func: Usage
  docs: trace: fix a typo
This commit is contained in:
Linus Torvalds
2020-08-13 13:57:45 -07:00
parent 990f227371 1edcd4675e
commit dddcbc139e
18 changed files with 105 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/locking/locktypes.rst
+1 -1
View File
@@ -10,7 +10,7 @@ Introduction
============
The kernel provides a variety of locking primitives which can be divided
into two categories:
into three categories:
- Sleeping locks
- CPU local locks