diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-13 22:57:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-13 22:57:45 +0200 |
| commit | dddcbc139e96bd18d8c65ef7b7e440f0d32457c2 (patch) | |
| tree | 89691f5db5864a249640210902e3f418a1b7555a /Documentation/locking | |
| parent | Merge tag 's390-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/... (diff) | |
| parent | Documentation/locking/locktypes: fix the typo (diff) | |
| download | linux-dddcbc139e96bd18d8c65ef7b7e440f0d32457c2.tar.xz linux-dddcbc139e96bd18d8c65ef7b7e440f0d32457c2.zip | |
Merge tag 'docs-5.9-2' of git://git.lwn.net/linux
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
Diffstat (limited to 'Documentation/locking')
| -rw-r--r-- | Documentation/locking/locktypes.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/locking/locktypes.rst b/Documentation/locking/locktypes.rst index 1b577a8bf982..4cefed8048ca 100644 --- a/Documentation/locking/locktypes.rst +++ b/Documentation/locking/locktypes.rst @@ -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 |