Skip to content

Commit 86292b3

Browse files
committed
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 ...
2 parents 1ac884f + 3e761a4 commit 86292b3

423 files changed

Lines changed: 1288 additions & 946 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/DocBook/libata.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ and other resources, etc.
10201020
</itemizedlist>
10211021

10221022
<para>
1023-
Of errors detected as above, the followings are not ATA/ATAPI
1023+
Of errors detected as above, the following are not ATA/ATAPI
10241024
device errors but ATA bus errors and should be handled
10251025
according to <xref linkend="excatATAbusErr"/>.
10261026
</para>

Documentation/acpi/method-customizing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Note: To get the ACPI debug object output (Store (AAAA, Debug)),
5757
3. undo your changes
5858
The "undo" operation is not supported for a new inserted method
5959
right now, i.e. we can not remove a method currently.
60-
For an overrided method, in order to undo your changes, please
60+
For an overridden method, in order to undo your changes, please
6161
save a copy of the method original ASL code in step c) section 1,
6262
and redo step c) ~ g) to override the method with the original one.
6363

Documentation/acpi/method-tracing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ tracing facility.
152152
Users can enable/disable this debug tracing feature by executing
153153
the following command:
154154
# echo string > /sys/module/acpi/parameters/trace_state
155-
Where "string" should be one of the followings:
155+
Where "string" should be one of the following:
156156
"disable"
157157
Disable the method tracing feature.
158158
"enable"

Documentation/admin-guide/ras.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ That defines some categories of errors:
8181
still run, eventually replacing the affected hardware by a hot spare,
8282
if available.
8383

84-
Also, when an error happens on an userspace process, it is also possible to
84+
Also, when an error happens on a userspace process, it is also possible to
8585
kill such process and let userspace restart it.
8686

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

Documentation/blockdev/mflash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ driver and currently works well under standard IDE subsystem. Actually it's
1717
one chip SSD. IO mode is ATA-like custom mode for the host that doesn't have
1818
IDE interface.
1919

20-
Followings are brief descriptions about IO mode.
20+
Following are brief descriptions about IO mode.
2121
A. IO mode based on ATA protocol and uses some custom command. (read confirm,
2222
write confirm)
2323
B. IO mode uses SRAM bus interface.

Documentation/device-mapper/dm-raid.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ Version History
319319
1.5.2 'mismatch_cnt' is zero unless [last_]sync_action is "check".
320320
1.6.0 Add discard support (and devices_handle_discard_safely module param).
321321
1.7.0 Add support for MD RAID0 mappings.
322-
1.8.0 Explictely check for compatible flags in the superblock metadata
322+
1.8.0 Explicitly check for compatible flags in the superblock metadata
323323
and reject to start the raid set if any are set by a newer
324324
target version, thus avoiding data corruption on a raid set
325325
with a reshape in progress.

Documentation/devicetree/bindings/mfd/qcom-rpm.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ see regulator.txt - with additional custom properties described below:
234234
- qcom,switch-mode-frequency:
235235
Usage: required
236236
Value type: <u32>
237-
Definition: Frequency (Hz) of the swith mode power supply;
237+
Definition: Frequency (Hz) of the switch mode power supply;
238238
must be one of:
239239
19200000, 9600000, 6400000, 4800000, 3840000, 3200000,
240240
2740000, 2400000, 2130000, 1920000, 1750000, 1600000,

Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
* Marvell Armada 370 / Armada XP / Armada 3700 Ethernet Controller (NETA)
22

33
Required properties:
4-
- compatible: could be one of the followings
4+
- compatible: could be one of the following:
55
"marvell,armada-370-neta"
66
"marvell,armada-xp-neta"
77
"marvell,armada-3700-neta"

Documentation/devicetree/bindings/opp/opp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Optional properties:
136136
larger OPP table, based on what version of the hardware we are running on. We
137137
still can't have multiple nodes with the same opp-hz value in OPP table.
138138

139-
It's an user defined array containing a hierarchy of hardware version numbers,
139+
It's a user defined array containing a hierarchy of hardware version numbers,
140140
supported by the OPP. For example: a platform with hierarchy of three levels
141141
of versions (A, B and C), this field should be like <X Y Z>, where X
142142
corresponds to Version hierarchy A, Y corresponds to version hierarchy B and Z

Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ the first two functions being GPIO in and out. The configuration on
66
the pins includes drive strength and pull-up.
77

88
Required properties:
9-
- compatible: Should be one of the followings (depending on you SoC):
9+
- compatible: Should be one of the following (depending on your SoC):
1010
"allwinner,sun4i-a10-pinctrl"
1111
"allwinner,sun5i-a10s-pinctrl"
1212
"allwinner,sun5i-a13-pinctrl"

0 commit comments

Comments
 (0)