The following commit has been merged into the locking/urgent branch of tip: Commit-ID: cb75c95c5262328bd4da3dd334f6826a3a34a979 Gitweb: https://git.kernel.org/tip/cb75c95c5262328bd4da3dd334f6826a3a34a979 Author: Huang Shijie <sjhuang@xxxxxxxxxxx> AuthorDate: Thu, 13 Aug 2020 14:02:20 +08:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Thu, 13 Aug 2020 20:59:06 +02:00 Documentation/locking/locktypes: Fix a typo We have three categories locks, not two. Signed-off-by: Huang Shijie <sjhuang@xxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Acked-by: Will Deacon <will@xxxxxxxxxx> Link: https://lore.kernel.org/r/20200813060220.18199-1-sjhuang@xxxxxxxxxxx --- Documentation/locking/locktypes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/locking/locktypes.rst b/Documentation/locking/locktypes.rst index 1b577a8..4cefed8 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
|