Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits) tree-wide: fix misspelling of "definition" in comments reiserfs: fix misspelling of "journaled" doc: Fix a typo in slub.txt. inotify: remove superfluous return code check hdlc: spelling fix in find_pvc() comment doc: fix regulator docs cut-and-pasteism mtd: Fix comment in Kconfig doc: Fix IRQ chip docs tree-wide: fix assorted typos all over the place drivers/ata/libata-sff.c: comment spelling fixes fix typos/grammos in Documentation/edac.txt sysctl: add missing comments fs/debugfs/inode.c: fix comment typos sgivwfb: Make use of ARRAY_SIZE. sky2: fix sky2_link_down copy/paste comment error tree-wide: fix typos "couter" -> "counter" tree-wide: fix typos "offest" -> "offset" fix kerneldoc for set_irq_msi() spidev: fix double "of of" in comment comment typo fix: sybsystem -> subsystem ...
This commit is contained in:
@@ -204,7 +204,7 @@ int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
|
||||
*
|
||||
* Description
|
||||
* Call the NetLabel mechanism to set the label of a packet using @sid.
|
||||
* Returns zero on auccess, negative values on failure.
|
||||
* Returns zero on success, negative values on failure.
|
||||
*
|
||||
*/
|
||||
int selinux_netlbl_skbuff_setsid(struct sk_buff *skb,
|
||||
|
||||
@@ -836,7 +836,7 @@ int security_bounded_transition(u32 old_sid, u32 new_sid)
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* type/domain unchaned */
|
||||
/* type/domain unchanged */
|
||||
if (old_context->type == new_context->type) {
|
||||
rc = 0;
|
||||
goto out;
|
||||
|
||||
Reference in New Issue
Block a user