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 <[email protected]>: (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

File tree

423 files changed

+1288
-946
lines changed

Some content is hidden

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

423 files changed

+1288
-946
lines changed

Documentation/DocBook/libata.tmpl

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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"

Documentation/devicetree/bindings/power/pd-samsung.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Optional Properties:
2323
- clock-names: The following clocks can be specified:
2424
- oscclk: Oscillator clock.
2525
- clkN: Input clocks to the devices in this power domain. These clocks
26-
will be reparented to oscclk before swithing power domain off.
26+
will be reparented to oscclk before switching power domain off.
2727
Their original parent will be brought back after turning on
2828
the domain. Maximum of 4 clocks (N = 0 to 3) are supported.
2929
- asbN: Clocks required by asynchronous bridges (ASB) present in

Documentation/devicetree/bindings/soc/rockchip/grf.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ From RK3368 SoCs, the GRF is divided into two sections,
1010

1111
Required Properties:
1212

13-
- compatible: GRF should be one of the followings
13+
- compatible: GRF should be one of the following:
1414
- "rockchip,rk3036-grf", "syscon": for rk3036
1515
- "rockchip,rk3066-grf", "syscon": for rk3066
1616
- "rockchip,rk3188-grf", "syscon": for rk3188
1717
- "rockchip,rk3228-grf", "syscon": for rk3228
1818
- "rockchip,rk3288-grf", "syscon": for rk3288
1919
- "rockchip,rk3368-grf", "syscon": for rk3368
2020
- "rockchip,rk3399-grf", "syscon": for rk3399
21-
- compatible: PMUGRF should be one of the followings
21+
- compatible: PMUGRF should be one of the following:
2222
- "rockchip,rk3368-pmugrf", "syscon": for rk3368
2323
- "rockchip,rk3399-pmugrf", "syscon": for rk3399
2424
- compatible: SGRF should be one of the following

Documentation/devicetree/bindings/sound/rockchip-i2s.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ audio data transfer between devices in the system.
55

66
Required properties:
77

8-
- compatible: should be one of the followings
8+
- compatible: should be one of the following:
99
- "rockchip,rk3066-i2s": for rk3066
1010
- "rockchip,rk3188-i2s", "rockchip,rk3066-i2s": for rk3188
1111
- "rockchip,rk3288-i2s", "rockchip,rk3066-i2s": for rk3288
@@ -17,7 +17,7 @@ Required properties:
1717
Documentation/devicetree/bindings/dma/dma.txt
1818
- dma-names: should include "tx" and "rx".
1919
- clocks: a list of phandle + clock-specifer pairs, one for each entry in clock-names.
20-
- clock-names: should contain followings:
20+
- clock-names: should contain the following:
2121
- "i2s_hclk": clock for I2S BUS
2222
- "i2s_clk" : clock for I2S controller
2323
- rockchip,playback-channels: max playback channels, if not set, 8 channels default.

Documentation/devicetree/bindings/sound/sun4i-codec.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Required properties:
1414
- dma-names: should include "tx" and "rx".
1515
- clocks: a list of phandle + clock-specifer pairs, one for each entry
1616
in clock-names.
17-
- clock-names: should contain followings:
17+
- clock-names: should contain the following:
1818
- "apb": the parent APB clock for this controller
1919
- "codec": the parent module clock
2020

Documentation/devicetree/bindings/sound/sun4i-i2s.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ audio data transfer between devices in the system.
55

66
Required properties:
77

8-
- compatible: should be one of the followings
8+
- compatible: should be one of the following:
99
- "allwinner,sun4i-a10-i2s"
1010
- "allwinner,sun6i-a31-i2s"
1111
- reg: physical base address of the controller and length of memory mapped
@@ -15,7 +15,7 @@ Required properties:
1515
Documentation/devicetree/bindings/dma/dma.txt
1616
- dma-names: should include "tx" and "rx".
1717
- clocks: a list of phandle + clock-specifer pairs, one for each entry in clock-names.
18-
- clock-names: should contain followings:
18+
- clock-names: should contain the following:
1919
- "apb" : clock for the I2S bus interface
2020
- "mod" : module clock for the I2S controller
2121
- #sound-dai-cells : Must be equal to 0

Documentation/filesystems/autofs4-mount-control.txt

+1
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ struct autofs_dev_ioctl {
179179
* including this struct */
180180
__s32 ioctlfd; /* automount command fd */
181181

182+
/* Command parameters */
182183
union {
183184
struct args_protover protover;
184185
struct args_protosubver protosubver;

Documentation/filesystems/autofs4.txt

+24-15
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ directory is a mount trap only if the filesystem is mounted *direct*
6565
and the root is empty.
6666

6767
Directories created in the root directory are mount traps only if the
68-
filesystem is mounted *indirect* and they are empty.
68+
filesystem is mounted *indirect* and they are empty.
6969

7070
Directories further down the tree depend on the *maxproto* mount
7171
option and particularly whether it is less than five or not.
@@ -352,7 +352,7 @@ Communicating with autofs: root directory ioctls
352352
------------------------------------------------
353353

354354
The root directory of an autofs filesystem will respond to a number of
355-
ioctls. The process issuing the ioctl must have the CAP_SYS_ADMIN
355+
ioctls. The process issuing the ioctl must have the CAP_SYS_ADMIN
356356
capability, or must be the automount daemon.
357357

358358
The available ioctl commands are:
@@ -425,8 +425,20 @@ Each ioctl is passed a pointer to an `autofs_dev_ioctl` structure:
425425
* including this struct */
426426
__s32 ioctlfd; /* automount command fd */
427427

428-
__u32 arg1; /* Command parameters */
429-
__u32 arg2;
428+
/* Command parameters */
429+
union {
430+
struct args_protover protover;
431+
struct args_protosubver protosubver;
432+
struct args_openmount openmount;
433+
struct args_ready ready;
434+
struct args_fail fail;
435+
struct args_setpipefd setpipefd;
436+
struct args_timeout timeout;
437+
struct args_requester requester;
438+
struct args_expire expire;
439+
struct args_askumount askumount;
440+
struct args_ismountpoint ismountpoint;
441+
};
430442

431443
char path[0];
432444
};
@@ -446,25 +458,22 @@ Commands are:
446458
set version numbers.
447459
- **AUTOFS_DEV_IOCTL_OPENMOUNT_CMD**: return an open file descriptor
448460
on the root of an autofs filesystem. The filesystem is identified
449-
by name and device number, which is stored in `arg1`. Device
450-
numbers for existing filesystems can be found in
461+
by name and device number, which is stored in `openmount.devid`.
462+
Device numbers for existing filesystems can be found in
451463
`/proc/self/mountinfo`.
452464
- **AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD**: same as `close(ioctlfd)`.
453465
- **AUTOFS_DEV_IOCTL_SETPIPEFD_CMD**: if the filesystem is in
454466
catatonic mode, this can provide the write end of a new pipe
455-
in `arg1` to re-establish communication with a daemon. The
456-
process group of the calling process is used to identify the
467+
in `setpipefd.pipefd` to re-establish communication with a daemon.
468+
The process group of the calling process is used to identify the
457469
daemon.
458470
- **AUTOFS_DEV_IOCTL_REQUESTER_CMD**: `path` should be a
459471
name within the filesystem that has been auto-mounted on.
460-
arg1 is the dev number of the underlying autofs. On successful
461-
return, `arg1` and `arg2` will be the UID and GID of the process
462-
which triggered that mount.
463-
472+
On successful return, `requester.uid` and `requester.gid` will be
473+
the UID and GID of the process which triggered that mount.
464474
- **AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD**: Check if path is a
465475
mountpoint of a particular type - see separate documentation for
466476
details.
467-
468477
- **AUTOFS_DEV_IOCTL_PROTOVER_CMD**:
469478
- **AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD**:
470479
- **AUTOFS_DEV_IOCTL_READY_CMD**:
@@ -474,7 +483,7 @@ Commands are:
474483
- **AUTOFS_DEV_IOCTL_EXPIRE_CMD**:
475484
- **AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD**: These all have the same
476485
function as the similarly named **AUTOFS_IOC** ioctls, except
477-
that **FAIL** can be given an explicit error number in `arg1`
486+
that **FAIL** can be given an explicit error number in `fail.status`
478487
instead of assuming `ENOENT`, and this **EXPIRE** command
479488
corresponds to **AUTOFS_IOC_EXPIRE_MULTI**.
480489

@@ -512,7 +521,7 @@ always be mounted "shared". e.g.
512521

513522
> `mount --make-shared /autofs/mount/point`
514523

515-
The automount daemon is only able to mange a single mount location for
524+
The automount daemon is only able to manage a single mount location for
516525
an autofs filesystem and if mounts on that are not 'shared', other
517526
locations will not behave as expected. In particular access to those
518527
other locations will likely result in the `ELOOP` error

Documentation/filesystems/quota.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Quota subsystem allows system administrator to set limits on used space and
66
number of used inodes (inode is a filesystem structure which is associated with
77
each file or directory) for users and/or groups. For both used space and number
88
of used inodes there are actually two limits. The first one is called softlimit
9-
and the second one hardlimit. An user can never exceed a hardlimit for any
9+
and the second one hardlimit. A user can never exceed a hardlimit for any
1010
resource (unless he has CAP_SYS_RESOURCE capability). User is allowed to exceed
1111
softlimit but only for limited period of time. This period is called "grace
1212
period" or "grace time". When grace time is over, user is not able to allocate

Documentation/kselftest.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ Install selftests
5959
=================
6060

6161
You can use kselftest_install.sh tool installs selftests in default
62-
location which is tools/testing/selftests/kselftest or an user specified
62+
location which is tools/testing/selftests/kselftest or a user specified
6363
location.
6464

6565
To install selftests in default location:
6666
$ cd tools/testing/selftests
6767
$ ./kselftest_install.sh
6868

69-
To install selftests in an user specified location:
69+
To install selftests in a user specified location:
7070
$ cd tools/testing/selftests
7171
$ ./kselftest_install.sh install_dir
7272

Documentation/media/dvb-drivers/ci.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ existing low level CI API.
2020
ca_zap
2121
~~~~~~
2222

23-
An userspace application, like ``ca_zap`` is required to handle encrypted
23+
A userspace application, like ``ca_zap`` is required to handle encrypted
2424
MPEG-TS streams.
2525

2626
The ``ca_zap`` userland application is in charge of sending the

Documentation/media/uapi/dvb/dvb-frontend-parameters.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ frontend parameters
99
The kind of parameters passed to the frontend device for tuning depend
1010
on the kind of hardware you are using.
1111

12-
The struct ``dvb_frontend_parameters`` uses an union with specific
12+
The struct ``dvb_frontend_parameters`` uses a union with specific
1313
per-system parameters. However, as newer delivery systems required more
1414
data, the structure size weren't enough to fit, and just extending its
1515
size would break the existing applications. So, those parameters were
@@ -23,7 +23,7 @@ So, newer applications should use
2323
instead, in order to be able to support the newer System Delivery like
2424
DVB-S2, DVB-T2, DVB-C2, ISDB, etc.
2525

26-
All kinds of parameters are combined as an union in the
26+
All kinds of parameters are combined as a union in the
2727
FrontendParameters structure:
2828

2929

Documentation/memory-hotplug.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ config options.
114114
Memory model -> Sparse Memory (CONFIG_SPARSEMEM)
115115
Allow for memory hot-add (CONFIG_MEMORY_HOTPLUG)
116116

117-
- To enable memory removal, the followings are also necessary
117+
- To enable memory removal, the following are also necessary
118118
Allow for memory hot remove (CONFIG_MEMORY_HOTREMOVE)
119119
Page Migration (CONFIG_MIGRATION)
120120

121-
- For ACPI memory hotplug, the followings are also necessary
121+
- For ACPI memory hotplug, the following are also necessary
122122
Memory hotplug (under ACPI Support menu) (CONFIG_ACPI_HOTPLUG_MEMORY)
123123
This option can be kernel module.
124124

Documentation/networking/cdc_mbim.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Basic usage
3838
===========
3939

4040
MBIM functions are inactive when unmanaged. The cdc_mbim driver only
41-
provides an userspace interface to the MBIM control channel, and will
41+
provides a userspace interface to the MBIM control channel, and will
4242
not participate in the management of the function. This implies that a
4343
userspace MBIM management application always is required to enable a
4444
MBIM function.
@@ -200,7 +200,7 @@ structure described in section 10.5.29 of [1].
200200
The DSS VLAN subdevices are used as a practical interface between the
201201
shared MBIM data channel and a MBIM DSS aware userspace application.
202202
It is not intended to be presented as-is to an end user. The
203-
assumption is that an userspace application initiating a DSS session
203+
assumption is that a userspace application initiating a DSS session
204204
also takes care of the necessary framing of the DSS data, presenting
205205
the stream to the end user in an appropriate way for the stream type.
206206

Documentation/scsi/ChangeLog.megaraid_sas

+1-1
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ ii. Reduced by 1 max cmds sent to FW from Driver to make the reply_q_sz same
549549
3 Older Version : 00.00.03.02
550550

551551
i. Send stop adapter to FW & Dump pending FW cmds before declaring adapter dead.
552-
New varible added to set dbg level.
552+
New variable added to set dbg level.
553553
ii. Disable interrupt made as fn pointer as they are different for 1068 / 1078
554554
iii. Frame count optimization. Main frame can contain 2 SGE for 64 bit SGLs and
555555
3 SGE for 32 bit SGL

Documentation/sound/hd-audio/notes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ If it's a regression, at best, send alsa-info outputs of both working
697697
and non-working kernels. This is really helpful because we can
698698
compare the codec registers directly.
699699

700-
Send a bug report either the followings:
700+
Send a bug report either the following:
701701

702702
kernel-bugzilla
703703
https://bugzilla.kernel.org/

Documentation/vm/userfaultfd.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ migration thread in the QEMU running in the destination node will
149149
receive the page that triggered the userfault and it'll map it as
150150
usual with the UFFDIO_COPY|ZEROPAGE (without actually knowing if it
151151
was spontaneously sent by the source or if it was an urgent page
152-
requested through an userfault).
152+
requested through a userfault).
153153

154154
By the time the userfaults start, the QEMU in the destination node
155155
doesn't need to keep any per-page state bitmap relative to the live

MAINTAINERS

+1
Original file line numberDiff line numberDiff line change
@@ -7286,6 +7286,7 @@ M: Masami Hiramatsu <[email protected]>
72867286
S: Maintained
72877287
F: Documentation/kprobes.txt
72887288
F: include/linux/kprobes.h
7289+
F: include/asm-generic/kprobes.h
72897290
F: kernel/kprobes.c
72907291

72917292
KS0108 LCD CONTROLLER DRIVER

arch/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ config OPROFILE_EVENT_MULTIPLEX
2929
The number of hardware counters is limited. The multiplexing
3030
feature enables OProfile to gather more events than counters
3131
are provided by the hardware. This is realized by switching
32-
between events at an user specified time interval.
32+
between events at a user specified time interval.
3333

3434
If unsure, say N.
3535

arch/alpha/include/asm/Kbuild

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ generic-y += preempt.h
1010
generic-y += sections.h
1111
generic-y += trace_clock.h
1212
generic-y += current.h
13+
generic-y += kprobes.h

0 commit comments

Comments
 (0)