Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89c9fea3 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.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  tty: fix comment for __tty_alloc_driver()
  init/main: properly align the multi-line comment
  init/main: Fix double "the" in comment
  Fix dead URLs to ftp.kernel.org
  drivers: Clean up duplicated email address
  treewide: Fix typo in xml/driver-api/basics.xml
  tools/testing/selftests/powerpc: remove redundant CFLAGS in Makefile: "-Wall -O2 -Wall" -> "-O2 -Wall"
  selftests/timers: Spelling s/privledges/privileges/
  HID: picoLCD: Spelling s/REPORT_WRTIE_MEMORY/REPORT_WRITE_MEMORY/
  net: phy: dp83848: Fix Typo
  UBI: Fix typos
  Documentation: ftrace.txt: Correct nice value of 120 priority
  net: fec: Fix typo in error msg and comment
  treewide: Fix typos in printk
parents 76f1948a 6fbc8798

Documentation/trace/ftrace.txt

+1 −1
Original line number Diff line number Diff line
@@ -1546,7 +1546,7 @@ Note, that the trace data shows the internal priority (99 - rtprio). 


  <idle>-0       3d..3    5us :      0:120:R ==> [003]  2389: 94:R sleep



The 0:120:R means idle was running with a nice priority of 0 (120 - 20)

The 0:120:R means idle was running with a nice priority of 0 (120 - 120)

and in the running state 'R'. The sleep task was scheduled in with

2389: 94:R. That is the priority is the kernel rtprio (99 - 5 = 94)

and it too is in the running state.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10143,7 +10143,7 @@ W: http://sourceforge.net/projects/accel-pptp 
PREEMPTIBLE KERNEL

M:	Robert Love <rml@tech9.net>

L:	kpreempt-tech@lists.sourceforge.net

W:	ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel

W:	https://www.kernel.org/pub/linux/kernel/people/rml/preempt-kernel

S:	Supported

F:	Documentation/preempt-locking.txt

F:	include/linux/preempt.h

drivers/block/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ config BLK_DEV_LOOP 


	  To use the loop device, you need the losetup utility, found in the

	  util-linux package, see

	  <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>.

	  <https://www.kernel.org/pub/linux/utils/util-linux/>.



	  The loop device driver can also be used to "hide" a file system in

	  a disk partition, floppy, or regular file, either using encryption

drivers/gpu/drm/sti/sti_compositor.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int sti_compositor_bind(struct device *dev, 
			/* Nothing to do, wait for the second round */

			break;

		default:

			DRM_ERROR("Unknow subdev compoment type\n");

			DRM_ERROR("Unknown subdev component type\n");

			return 1;

		}

	}

drivers/hid/hid-picolcd_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ void picolcd_debug_raw_event(struct picolcd_data *data, 
		}

		break;

	case REPORT_MEMORY:

		/* Data buffer in response to REPORT_READ_MEMORY or REPORT_WRTIE_MEMORY */

		/* Data buffer in response to REPORT_READ_MEMORY or REPORT_WRITE_MEMORY */

		snprintf(buff, BUFF_SZ, "report %s (%d, size=%d)\n",

			"REPORT_MEMORY", report->id, size-1);

		hid_debug_event(hdev, buff);