From: David Howells <dhowells@redhat.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>,
keyrings@vger.kernel.org, James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
linux-security-module@vger.kernel.org, dhowells@redhat.com,
keyrings@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 6/9] security: keys: delete repeated words in comments
Date: Fri, 27 Nov 2020 16:46:09 +0000 [thread overview]
Message-ID: <160649556922.2744658.10487958329960976523.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <160649552401.2744658.15096366594785577090.stgit@warthog.procyon.org.uk>
From: Randy Dunlap <rdunlap@infradead.org>
Drop repeated words in comments.
{to, will, the}
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: keyrings@vger.kernel.org
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: linux-security-module@vger.kernel.org
---
security/keys/keyctl.c | 2 +-
security/keys/keyring.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 61a614c21b9b..96a92a645216 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -506,7 +506,7 @@ long keyctl_keyring_clear(key_serial_t ringid)
* keyring, otherwise replace the link to the matching key with a link to the
* new key.
*
- * The key must grant the caller Link permission and the the keyring must grant
+ * The key must grant the caller Link permission and the keyring must grant
* the caller Write permission. Furthermore, if an additional link is created,
* the keyring's quota will be extended.
*
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index 977066208387..5e6a90760753 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -881,7 +881,7 @@ static bool search_nested_keyrings(struct key *keyring,
*
* Keys are matched to the type provided and are then filtered by the match
* function, which is given the description to use in any way it sees fit. The
- * match function may use any attributes of a key that it wishes to to
+ * match function may use any attributes of a key that it wishes to
* determine the match. Normally the match function from the key type would be
* used.
*
@@ -1204,7 +1204,7 @@ static int keyring_detect_cycle_iterator(const void *object,
}
/*
- * See if a cycle will will be created by inserting acyclic tree B in acyclic
+ * See if a cycle will be created by inserting acyclic tree B in acyclic
* tree A at the topmost level (ie: as a direct child of A).
*
* Since we are adding B to A at the top level, checking for cycles should just
next prev parent reply other threads:[~2020-11-27 16:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-27 16:45 [PATCH 0/9] keys: Miscellaneous fixes David Howells
2020-11-27 16:45 ` [PATCH 1/9] security: keys: Fix fall-through warnings for Clang David Howells
2020-11-27 16:45 ` [PATCH 2/9] keys: Remove outdated __user annotations David Howells
2020-11-27 16:45 ` [PATCH 3/9] watch_queue: Drop references to /dev/watch_queue David Howells
2020-11-27 16:45 ` [PATCH 4/9] security/keys: use kvfree_sensitive() David Howells
2020-11-27 16:46 ` [PATCH 5/9] KEYS: asymmetric: Fix kerneldoc David Howells
2020-11-27 16:46 ` David Howells [this message]
2020-11-27 16:46 ` [PATCH 7/9] KEYS: remove redundant memset David Howells
2020-11-27 16:46 ` [PATCH 8/9] crypto: asymmetric_keys: fix some comments in pkcs7_parser.h David Howells
2020-11-27 16:46 ` [PATCH 9/9] encrypted-keys: Replace HTTP links with HTTPS ones David Howells
2020-11-29 3:38 ` [PATCH 0/9] keys: Miscellaneous fixes Jarkko Sakkinen
2020-11-30 9:21 ` David Howells
2020-12-02 16:43 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160649556922.2744658.10487958329960976523.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jmorris@namei.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=serge@hallyn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).