| Message ID | 9299abf4-75e3-6d73-a8b8-c2617208a990@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | LSM: drop duplicated words in header file comments | expand |
On Fri, Jul 17, 2020 at 04:36:40PM -0700, Randy Dunlap wrote: > From: Randy Dunlap <rdunlap@infradead.org> > > Drop the doubled words "the" and "and" in comments. > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: James Morris <jmorris@namei.org> > Cc: "Serge E. Hallyn" <serge@hallyn.com> Acked-by: Serge Hallyn <serge@hallyn.com> > Cc: linux-security-module@vger.kernel.org > --- > include/linux/lsm_hook_defs.h | 2 +- > include/linux/lsm_hooks.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > --- linux-next-20200714.orig/include/linux/lsm_hook_defs.h > +++ linux-next-20200714/include/linux/lsm_hook_defs.h > @@ -15,7 +15,7 @@ > */ > > /* > - * The macro LSM_HOOK is used to define the data structures required by the > + * The macro LSM_HOOK is used to define the data structures required by > * the LSM framework using the pattern: > * > * LSM_HOOK(<return_type>, <default_value>, <hook_name>, args...) > --- linux-next-20200714.orig/include/linux/lsm_hooks.h > +++ linux-next-20200714/include/linux/lsm_hooks.h > @@ -822,7 +822,7 @@ > * structure. Note that the security field was not added directly to the > * socket structure, but rather, the socket security information is stored > * in the associated inode. Typically, the inode alloc_security hook will > - * allocate and and attach security information to > + * allocate and attach security information to > * SOCK_INODE(sock)->i_security. This hook may be used to update the > * SOCK_INODE(sock)->i_security field with additional information that > * wasn't available when the inode was allocated. >
On Fri, 17 Jul 2020, Randy Dunlap wrote: > From: Randy Dunlap <rdunlap@infradead.org> > > Drop the doubled words "the" and "and" in comments. > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Applied to git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general
--- linux-next-20200714.orig/include/linux/lsm_hook_defs.h +++ linux-next-20200714/include/linux/lsm_hook_defs.h @@ -15,7 +15,7 @@ */ /* - * The macro LSM_HOOK is used to define the data structures required by the + * The macro LSM_HOOK is used to define the data structures required by * the LSM framework using the pattern: * * LSM_HOOK(<return_type>, <default_value>, <hook_name>, args...) --- linux-next-20200714.orig/include/linux/lsm_hooks.h +++ linux-next-20200714/include/linux/lsm_hooks.h @@ -822,7 +822,7 @@ * structure. Note that the security field was not added directly to the * socket structure, but rather, the socket security information is stored * in the associated inode. Typically, the inode alloc_security hook will - * allocate and and attach security information to + * allocate and attach security information to * SOCK_INODE(sock)->i_security. This hook may be used to update the * SOCK_INODE(sock)->i_security field with additional information that * wasn't available when the inode was allocated.