Commit 69c1fd97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 72f35423 fad7c902

Documentation/admin-guide/binfmt-misc.rst

+2 −2
Original line number Diff line number Diff line
@@ -140,8 +140,8 @@ Hints 
-----



If you want to pass special arguments to your interpreter, you can

write a wrapper script for it. See Documentation/admin-guide/java.rst for an

example.

write a wrapper script for it.

See :doc:`Documentation/admin-guide/java.rst <./java>` for an example.



Your interpreter should NOT look in the PATH for the filename; the kernel

passes it the full filename (or the file descriptor) to use.  Using ``$PATH`` can

arch/sh/include/mach-common/mach/highlander.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define PA_IRLPRI4      (PA_BCR+0x000a) /* Interrupt Priorty 4 */

#define PA_RSTCTL       (PA_BCR+0x000c) /* Reset Control */

#define PA_PCIBD        (PA_BCR+0x000e) /* PCI Board detect control */

#define PA_PCICD        (PA_BCR+0x0010) /* PCI Conector detect control */

#define PA_PCICD        (PA_BCR+0x0010) /* PCI Connector detect control */

#define PA_EXTGIO       (PA_BCR+0x0016) /* Extension GPIO Control */

#define PA_IVDRMON      (PA_BCR+0x0018) /* iVDR Moniter control */

#define PA_IVDRCTL      (PA_BCR+0x001a) /* iVDR control */
@@ -80,7 +80,7 @@ 
#define	PA_SDPOW	(PA_BCR+0x0004)	/* SD Power control */

#define	PA_RSTCTL	(PA_BCR+0x0006)	/* Device Reset control */

#define	PA_PCIBD	(PA_BCR+0x0008)	/* PCI Board detect control */

#define	PA_PCICD	(PA_BCR+0x000a)	/* PCI Conector detect control */

#define	PA_PCICD	(PA_BCR+0x000a)	/* PCI Connector detect control */

#define	PA_ZIGIO1	(PA_BCR+0x000c)	/* Zigbee IO control 1 */

#define	PA_ZIGIO2	(PA_BCR+0x000e)	/* Zigbee IO control 2 */

#define	PA_ZIGIO3	(PA_BCR+0x0010)	/* Zigbee IO control 3 */

arch/x86/boot/apm.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int query_apm_bios(void) 
	intcall(0x15, &ireg, &oreg);



	if ((oreg.eflags & X86_EFLAGS_CF) || oreg.bx != 0x504d) {

		/* Failure with 32-bit connect, try to disconect and ignore */

		/* Failure with 32-bit connect, try to disconnect and ignore */

		ireg.al = 0x04;

		intcall(0x15, &ireg, NULL);

		return -1;

block/blk-mq-virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 * @first_vec:	first interrupt vectors to use for queues (usually 0)

 *

 * This function assumes the virtio device @vdev has at least as many available

 * interrupt vetors as @set has queues.  It will then queuery the vector

 * interrupt vectors as @set has queues.  It will then query the vector

 * corresponding to each queue for it's affinity mask and built queue mapping

 * that maps a queue to the CPUs that have irq affinity for the corresponding

 * vector.

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c

+2 −2
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ static uint64_t sdma_v4_0_ring_get_wptr(struct amdgpu_ring *ring) 
}



/**

 * sdma_v4_0_ring_set_wptr - commit the write pointer

 * sdma_v4_0_page_ring_set_wptr - commit the write pointer

 *

 * @ring: amdgpu ring pointer

 *
@@ -977,7 +977,7 @@ static void sdma_v4_0_page_stop(struct amdgpu_device *adev) 
}



/**

 * sdma_v_0_ctx_switch_enable - stop the async dma engines context switch

 * sdma_v4_0_ctx_switch_enable - stop the async dma engines context switch

 *

 * @adev: amdgpu_device pointer

 * @enable: enable/disable the DMA MEs context switch.

CRA Git | Maintained and supported by SUSTech CRA and CCSE