1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/keys.txt b/Documentation/keys.txt
index c17c4ca74302..eeda00f82d2c 100644
--- a/Documentation/keys.txt
+++ b/Documentation/keys.txt
@@ -500,6 +500,10 @@ The keyctl syscall functions are:
     The link procedure checks the nesting of the keyrings, returning ELOOP if
     it appears too deep or EDEADLK if the link would introduce a cycle.
+     Any links within the keyring to keys that match the new key in terms of
+     type and description will be discarded from the keyring as the new one is
+     added.
 (*) Unlink a key or keyring from another keyring:

diff --git a/Documentation/keys.txt b/Documentation/keys.txt index c17c4ca74302..eeda00f82d2c 100644 --- a/Documentation/keys.txt +++ b/Documentation/keys.txt
@@ -500,6 +500,10 @@ The keyctl syscall functions are:
500	The link procedure checks the nesting of the keyrings, returning ELOOP if	500	The link procedure checks the nesting of the keyrings, returning ELOOP if
501	it appears too deep or EDEADLK if the link would introduce a cycle.	501	it appears too deep or EDEADLK if the link would introduce a cycle.
502		502
		503	Any links within the keyring to keys that match the new key in terms of
		504	type and description will be discarded from the keyring as the new one is
		505	added.
		506
503		507
504	(*) Unlink a key or keyring from another keyring:	508	(*) Unlink a key or keyring from another keyring:
505		509