Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull "trivial tree" updates from Jiri Kosina: "Usual pile from trivial tree everyone is so eagerly waiting for" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) Remove MN10300_PROC_MN2WS0038 mei: fix comments treewide: Fix typos in Kconfig kprobes: update jprobe_example.c for do_fork() change Documentation: change "&" to "and" in Documentation/applying-patches.txt Documentation: remove obsolete pcmcia-cs from Changes Documentation: update links in Changes Documentation: Docbook: Fix generated DocBook/kernel-api.xml score: Remove GENERIC_HAS_IOMAP gpio: fix 'CONFIG_GPIO_IRQCHIP' comments tty: doc: Fix grammar in serial/tty dma-debug: modify check_for_stack output treewide: fix errors in printk genirq: fix reference in devm_request_threaded_irq comment treewide: fix synchronize_rcu() in comments checkstack.pl: port to AArch64 doc: queue-sysfs: minor fixes init/do_mounts: better syntax description MIPS: fix comment spelling powerpc/simpleboot: fix comment ...
This commit is contained in:
@@ -309,7 +309,7 @@ int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size)
|
||||
/**
|
||||
* ipcget_new - create a new ipc object
|
||||
* @ns: ipc namespace
|
||||
* @ids: ipc identifer set
|
||||
* @ids: ipc identifier set
|
||||
* @ops: the actual creation routine to call
|
||||
* @params: its parameters
|
||||
*
|
||||
@@ -363,7 +363,7 @@ static int ipc_check_perms(struct ipc_namespace *ns,
|
||||
/**
|
||||
* ipcget_public - get an ipc object or create a new one
|
||||
* @ns: ipc namespace
|
||||
* @ids: ipc identifer set
|
||||
* @ids: ipc identifier set
|
||||
* @ops: the actual creation routine to call
|
||||
* @params: its parameters
|
||||
*
|
||||
@@ -669,7 +669,7 @@ out:
|
||||
|
||||
/**
|
||||
* ipcget - Common sys_*get() code
|
||||
* @ns: namsepace
|
||||
* @ns: namespace
|
||||
* @ids: ipc identifier set
|
||||
* @ops: operations to be called on ipc object creation, permission checks
|
||||
* and further checks
|
||||
|
Reference in New Issue
Block a user