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

Commit 86292b33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge yet more updates from Andrew Morton:

 - a few MM remainders

 - misc things

 - autofs updates

 - signals

 - affs updates

 - ipc

 - nilfs2

 - spelling.txt updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (78 commits)
  mm, x86: fix HIGHMEM64 && PARAVIRT build config for native_pud_clear()
  mm: add arch-independent testcases for RODATA
  hfs: atomically read inode size
  mm: clarify mm_struct.mm_{users,count} documentation
  mm: use mmget_not_zero() helper
  mm: add new mmget() helper
  mm: add new mmgrab() helper
  checkpatch: warn when formats use %Z and suggest %z
  lib/vsprintf.c: remove %Z support
  scripts/spelling.txt: add some typo-words
  scripts/spelling.txt: add "followings" pattern and fix typo instances
  scripts/spelling.txt: add "therfore" pattern and fix typo instances
  scripts/spelling.txt: add "overwriten" pattern and fix typo instances
  scripts/spelling.txt: add "overwritting" pattern and fix typo instances
  scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
  scripts/spelling.txt: add "disassocation" pattern and fix typo instances
  scripts/spelling.txt: add "omited" pattern and fix typo instances
  scripts/spelling.txt: add "explictely" pattern and fix typo instances
  scripts/spelling.txt: add "applys" pattern and fix typo instances
  scripts/spelling.txt: add "configuartion" pattern and fix typo instances
  ...
parents 1ac884f1 3e761a42

Documentation/DocBook/libata.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -1020,7 +1020,7 @@ and other resources, etc. 
	</itemizedlist>

	</itemizedlist>





	<para>

	<para>

	Of errors detected as above, the followings are not ATA/ATAPI

	Of errors detected as above, the following are not ATA/ATAPI

	device errors but ATA bus errors and should be handled

	device errors but ATA bus errors and should be handled

	according to <xref linkend="excatATAbusErr"/>.

	according to <xref linkend="excatATAbusErr"/>.

	</para>

	</para>

Documentation/acpi/method-customizing.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ Note: To get the ACPI debug object output (Store (AAAA, Debug)), 
3. undo your changes

3. undo your changes

   The "undo" operation is not supported for a new inserted method

   The "undo" operation is not supported for a new inserted method

   right now, i.e. we can not remove a method currently.

   right now, i.e. we can not remove a method currently.

   For an overrided method, in order to undo your changes, please

   For an overridden method, in order to undo your changes, please

   save a copy of the method original ASL code in step c) section 1,

   save a copy of the method original ASL code in step c) section 1,

   and redo step c) ~ g) to override the method with the original one.

   and redo step c) ~ g) to override the method with the original one.

Documentation/acpi/method-tracing.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -152,7 +152,7 @@ tracing facility. 
	Users can enable/disable this debug tracing feature by executing

	Users can enable/disable this debug tracing feature by executing

	the following command:

	the following command:

	    # echo string > /sys/module/acpi/parameters/trace_state

	    # echo string > /sys/module/acpi/parameters/trace_state

	Where "string" should be one of the followings:

	Where "string" should be one of the following:

	"disable"

	"disable"

	    Disable the method tracing feature.

	    Disable the method tracing feature.

	"enable"

	"enable"

Documentation/admin-guide/ras.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ That defines some categories of errors: 
  still run, eventually replacing the affected hardware by a hot spare,

  still run, eventually replacing the affected hardware by a hot spare,

  if available.

  if available.





  Also, when an error happens on an userspace process, it is also possible to

  Also, when an error happens on a userspace process, it is also possible to

  kill such process and let userspace restart it.

  kill such process and let userspace restart it.





The mechanism for handling non-fatal errors is usually complex and may

The mechanism for handling non-fatal errors is usually complex and may

Documentation/blockdev/mflash.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ driver and currently works well under standard IDE subsystem. Actually it's 
one chip SSD. IO mode is ATA-like custom mode for the host that doesn't have

one chip SSD. IO mode is ATA-like custom mode for the host that doesn't have

IDE interface.

IDE interface.





Followings are brief descriptions about IO mode.

Following are brief descriptions about IO mode.

A. IO mode based on ATA protocol and uses some custom command. (read confirm,

A. IO mode based on ATA protocol and uses some custom command. (read confirm,

write confirm)

write confirm)

B. IO mode uses SRAM bus interface.

B. IO mode uses SRAM bus interface.