git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[sfrench/cifs-2.6.git]
/
Documentation
/
pi-futex.txt
diff --git
a/Documentation/pi-futex.txt
b/Documentation/pi-futex.txt
index aafddbee7377496593e9b4066bc20f5ef845dcbd..b154f6c0c36e44b28c90732eea098abbe04fe841 100644
(file)
--- a/
Documentation/pi-futex.txt
+++ b/
Documentation/pi-futex.txt
@@
-119,4
+119,4
@@
properties of futexes, and all four combinations are possible: futex,
robust-futex, PI-futex, robust+PI-futex.
More details about priority inheritance can be found in
-Documentation/rt-mutex.txt.
+Documentation/
locking/
rt-mutex.txt.