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

Commit 008d23e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
parents 8f685fbd bfc672dc

Documentation/DocBook/mtdnand.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void board_hwcontrol(struct mtd_info *mtd, int cmd) 
		<title>Device ready function</title>

		<para>

			If the hardware interface has the ready busy pin of the NAND chip connected to a

			GPIO or other accesible I/O pin, this function is used to read back the state of the

			GPIO or other accessible I/O pin, this function is used to read back the state of the

			pin. The function has no arguments and should return 0, if the device is busy (R/B pin 

			is low) and 1, if the device is ready (R/B pin is high).

			If the hardware interface does not give access to the ready busy pin, then

Documentation/cgroups/cgroup_event_listener.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int main(int argc, char **argv) 


		if (ret == -1) {

			perror("cgroup.event_control "

					"is not accessable any more");

					"is not accessible any more");

			break;

		}

Documentation/cgroups/memcg_test.txt

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y. 
	written to move_charge_at_immigrate.



 9.10 Memory thresholds

	Memory controler implements memory thresholds using cgroups notification

	Memory controller implements memory thresholds using cgroups notification

	API. You can use Documentation/cgroups/cgroup_event_listener.c to test

	it.

Documentation/iostats.txt

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ Field 9 -- # of I/Os currently in progress 
    The only field that should go to zero. Incremented as requests are

    given to appropriate struct request_queue and decremented as they finish.

Field 10 -- # of milliseconds spent doing I/Os

    This field is increases so long as field 9 is nonzero.

    This field increases so long as field 9 is nonzero.

Field 11 -- weighted # of milliseconds spent doing I/Os

    This field is incremented at each I/O start, I/O completion, I/O

    merge, or read of these stats by the number of I/Os in progress

Documentation/kdump/kdump.txt

+9 −6
Original line number Diff line number Diff line
@@ -65,18 +65,21 @@ Install kexec-tools 


2) Download the kexec-tools user-space package from the following URL:



http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools.tar.gz

http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools.tar.gz



This is a symlink to the latest version.



The latest kexec-tools git tree is available at:



git://git.kernel.org/pub/scm/linux/kernel/git/horms/kexec-tools.git

or

http://www.kernel.org/git/?p=linux/kernel/git/horms/kexec-tools.git

git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git

and

http://www.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git



There is also a gitweb interface available at

http://www.kernel.org/git/?p=utils/kernel/kexec/kexec-tools.git



More information about kexec-tools can be found at

http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/README.html

http://www.kernel.org/pub/linux/utils/kernel/kexec/README.html



3) Unpack the tarball with the tar command, as follows:
@@ -439,6 +442,6 @@ To Do 
Contact

=======



Vivek Goyal (vgoyal@in.ibm.com)

Vivek Goyal (vgoyal@redhat.com)

Maneesh Soni (maneesh@in.ibm.com)