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

Commit 99dbb163 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 the trivial tree from Jiri Kosina:
 "Tiny usual fixes all over the place"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
  doc: fix old config name of kprobetrace
  fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
  btrfs: fix the commment for the action flags in delayed-ref.h
  btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
  vfs: fix kerneldoc for generic_fh_to_parent()
  treewide: fix comment/printk/variable typos
  ipr: fix small coding style issues
  doc: fix broken utf8 encoding
  nfs: comment fix
  platform/x86: fix asus_laptop.wled_type module parameter
  mfd: printk/comment fixes
  doc: getdelays.c: remember to close() socket on error in create_nl_socket()
  doc: aliasing-test: close fd on write error
  mmc: fix comment typos
  dma: fix comments
  spi: fix comment/printk typos in spi
  Coccinelle: fix typo in memdup_user.cocci
  tmiofb: missing NULL pointer checks
  tools: perf: Fix typo in tools/perf
  tools/testing: fix comment / output typos
  ...
parents aae6f989 9c33c512

Documentation/accounting/getdelays.c

+2 −3
Original line number Diff line number Diff line
@@ -98,10 +98,9 @@ static int create_nl_socket(int protocol) 
	if (rcvbufsz)

		if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF,

				&rcvbufsz, sizeof(rcvbufsz)) < 0) {

			fprintf(stderr, "Unable to set socket rcv buf size "

					"to %d\n",

			fprintf(stderr, "Unable to set socket rcv buf size to %d\n",

				rcvbufsz);

			return -1;

			goto error;

		}



	memset(&local, 0, sizeof(local));

Documentation/dontdiff

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ mach-types.h 
machtypes.h

map

map_hugetlb

maui_boot.h

media

mconf

miboot*

Documentation/ia64/aliasing-test.c

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ static int read_rom(char *path) 


	rc = write(fd, "1", 2);

	if (rc <= 0) {

		close(fd);

		perror("write");

		return -1;

	}

Documentation/power/swsusp.txt

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ before suspend (it is limited to 500 MB by default). 


Article about goals and implementation of Software Suspend for Linux

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Author: G‚ábor Kuti

Author: Gábor Kuti

Last revised: 2003-10-20 by Pavel Machek



Idea and goals to achieve

Documentation/trace/kprobetrace.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ kprobes can probe (this means, all functions body except for __kprobes 
functions). Unlike the Tracepoint based event, this can be added and removed

dynamically, on the fly.



To enable this feature, build your kernel with CONFIG_KPROBE_TRACING=y.

To enable this feature, build your kernel with CONFIG_KPROBE_EVENT=y.



Similar to the events tracer, this doesn't need to be activated via

current_tracer. Instead of that, add probe points via