Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina:
"My attempt to revitalize trivial queue I've been neglecting for years
(what a disaster that was for this world, right? :) ) with patches
collected from backlog that were still relevant and not applied
elsewhere in the meantime"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
err.h: remove deprecated PTR_RET for good
blk-mq: Fix typo in comment
x86/boot: Fix comment spelling
sh: mach-highlander: Fix comment spelling
s390/dasd: Fix comment spelling
mfd: wm8994: Fix comment spelling
docs: Add reference in binfmt-misc.rst
genirq: fix kerneldoc comment for irq_desc
drm/amdgpu: fix two documentation mismatch issues
HID: fix Kconfig word ordering
list/hashtable: minor documentation corrections.

+15 -18
+2 -2
Documentation/admin-guide/binfmt-misc.rst
··· 140 140 ----- 141 141 142 142 If you want to pass special arguments to your interpreter, you can 143 - write a wrapper script for it. See Documentation/admin-guide/java.rst for an 144 - example. 143 + write a wrapper script for it. 144 + See :doc:`Documentation/admin-guide/java.rst <./java>` for an example. 145 145 146 146 Your interpreter should NOT look in the PATH for the filename; the kernel 147 147 passes it the full filename (or the file descriptor) to use. Using ``$PATH`` can
+2 -2
arch/sh/include/mach-common/mach/highlander.h
··· 18 18 #define PA_IRLPRI4 (PA_BCR+0x000a) /* Interrupt Priorty 4 */ 19 19 #define PA_RSTCTL (PA_BCR+0x000c) /* Reset Control */ 20 20 #define PA_PCIBD (PA_BCR+0x000e) /* PCI Board detect control */ 21 - #define PA_PCICD (PA_BCR+0x0010) /* PCI Conector detect control */ 21 + #define PA_PCICD (PA_BCR+0x0010) /* PCI Connector detect control */ 22 22 #define PA_EXTGIO (PA_BCR+0x0016) /* Extension GPIO Control */ 23 23 #define PA_IVDRMON (PA_BCR+0x0018) /* iVDR Moniter control */ 24 24 #define PA_IVDRCTL (PA_BCR+0x001a) /* iVDR control */ ··· 80 80 #define PA_SDPOW (PA_BCR+0x0004) /* SD Power control */ 81 81 #define PA_RSTCTL (PA_BCR+0x0006) /* Device Reset control */ 82 82 #define PA_PCIBD (PA_BCR+0x0008) /* PCI Board detect control */ 83 - #define PA_PCICD (PA_BCR+0x000a) /* PCI Conector detect control */ 83 + #define PA_PCICD (PA_BCR+0x000a) /* PCI Connector detect control */ 84 84 #define PA_ZIGIO1 (PA_BCR+0x000c) /* Zigbee IO control 1 */ 85 85 #define PA_ZIGIO2 (PA_BCR+0x000e) /* Zigbee IO control 2 */ 86 86 #define PA_ZIGIO3 (PA_BCR+0x0010) /* Zigbee IO control 3 */
+1 -1
arch/x86/boot/apm.c
··· 60 60 intcall(0x15, &ireg, &oreg); 61 61 62 62 if ((oreg.eflags & X86_EFLAGS_CF) || oreg.bx != 0x504d) { 63 - /* Failure with 32-bit connect, try to disconect and ignore */ 63 + /* Failure with 32-bit connect, try to disconnect and ignore */ 64 64 ireg.al = 0x04; 65 65 intcall(0x15, &ireg, NULL); 66 66 return -1;
+1 -1
block/blk-mq-virtio.c
··· 16 16 * @first_vec: first interrupt vectors to use for queues (usually 0) 17 17 * 18 18 * This function assumes the virtio device @vdev has at least as many available 19 - * interrupt vetors as @set has queues. It will then queuery the vector 19 + * interrupt vectors as @set has queues. It will then query the vector 20 20 * corresponding to each queue for it's affinity mask and built queue mapping 21 21 * that maps a queue to the CPUs that have irq affinity for the corresponding 22 22 * vector.
+2 -2
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
··· 677 677 } 678 678 679 679 /** 680 - * sdma_v4_0_ring_set_wptr - commit the write pointer 680 + * sdma_v4_0_page_ring_set_wptr - commit the write pointer 681 681 * 682 682 * @ring: amdgpu ring pointer 683 683 * ··· 977 977 } 978 978 979 979 /** 980 - * sdma_v_0_ctx_switch_enable - stop the async dma engines context switch 980 + * sdma_v4_0_ctx_switch_enable - stop the async dma engines context switch 981 981 * 982 982 * @adev: amdgpu_device pointer 983 983 * @enable: enable/disable the DMA MEs context switch.
+1 -1
drivers/hid/Kconfig
··· 1039 1039 1040 1040 U2F Zero only supports blinking its LED, so this driver doesn't 1041 1041 allow setting the brightness to anything but 1, which will 1042 - trigger a single blink and immediately reset to back 0. 1042 + trigger a single blink and immediately reset back to 0. 1043 1043 1044 1044 config HID_WACOM 1045 1045 tristate "Wacom Intuos/Graphire tablet support (USB)"
+1 -1
drivers/s390/block/dasd_3990_erp.c
··· 1987 1987 * DASD_3990_ERP_COMPOUND_CONFIG 1988 1988 * 1989 1989 * DESCRIPTION 1990 - * Handles the compound ERP action for configruation 1990 + * Handles the compound ERP action for configuration 1991 1991 * dependent error. 1992 1992 * Note: duplex handling is not implemented (yet). 1993 1993 *
-3
include/linux/err.h
··· 62 62 return 0; 63 63 } 64 64 65 - /* Deprecated */ 66 - #define PTR_RET(p) PTR_ERR_OR_ZERO(p) 67 - 68 65 #endif 69 66 70 67 #endif /* _LINUX_ERR_H */
+2 -2
include/linux/hashtable.h
··· 145 145 * hash entry 146 146 * @name: hashtable to iterate 147 147 * @bkt: integer to use as bucket loop cursor 148 - * @tmp: a &struct used for temporary storage 148 + * @tmp: a &struct hlist_node used for temporary storage 149 149 * @obj: the type * to use as a loop cursor for each entry 150 150 * @member: the name of the hlist_node within the struct 151 151 */ ··· 197 197 * same bucket safe against removals 198 198 * @name: hashtable to iterate 199 199 * @obj: the type * to use as a loop cursor for each entry 200 - * @tmp: a &struct used for temporary storage 200 + * @tmp: a &struct hlist_node used for temporary storage 201 201 * @member: the name of the hlist_node within the struct 202 202 * @key: the key of the objects to iterate over 203 203 */
+1 -1
include/linux/irqdesc.h
··· 24 24 * @handle_irq: highlevel irq-events handler 25 25 * @preflow_handler: handler called before the flow handler (currently used by sparc) 26 26 * @action: the irq action chain 27 - * @status: status information 27 + * @status_use_accessors: status information 28 28 * @core_internal_state__do_not_mess_with_it: core internal status information 29 29 * @depth: disable-depth, for nested irq_disable() calls 30 30 * @wake_depth: enable depth, for multiple irq_set_irq_wake() callers
+1 -1
include/linux/list.h
··· 989 989 /** 990 990 * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry 991 991 * @pos: the type * to use as a loop cursor. 992 - * @n: another &struct hlist_node to use as temporary storage 992 + * @n: a &struct hlist_node to use as temporary storage 993 993 * @head: the head for your list. 994 994 * @member: the name of the hlist_node within the struct. 995 995 */
+1 -1
include/linux/mfd/wm8994/pdata.h
··· 33 33 * DRC configurations are specified with a label and a set of register 34 34 * values to write (the enable bits will be ignored). At runtime an 35 35 * enumerated control will be presented for each DRC block allowing 36 - * the user to choose the configration to use. 36 + * the user to choose the configuration to use. 37 37 * 38 38 * Configurations may be generated by hand or by using the DRC control 39 39 * panel provided by the WISCE - see http://www.wolfsonmicro.com/wisce/