Skip to content

Commit d28b4c1

Browse files
author
Jiri Kosina
committed
Merge branch 'for-5.6/selftests' into for-next
2 parents 7f436b3 + f46e49a commit d28b4c1

4,061 files changed

Lines changed: 92537 additions & 47552 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.

‎.mailmap‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
108108
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
109109
Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
110110
<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
111+
Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
112+
Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>
113+
Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>
114+
Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
111115
Jean Tourrilhes <jt@hpl.hp.com>
112116
<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
113117
Jeff Garzik <jgarzik@pretzel.yyz.us>
@@ -196,7 +200,8 @@ Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
196200
Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
197201
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
198202
Patrick Mochel <mochel@digitalimplant.org>
199-
Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
203+
Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
204+
Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
200205
Peter A Jonsson <pj@ludd.ltu.se>
201206
Peter Oruba <peter@oruba.de>
202207
Peter Oruba <peter.oruba@amd.com>
@@ -229,6 +234,7 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
229234
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
230235
Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
231236
Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
237+
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
232238
Simon Kelley <simon@thekelleys.org.uk>
233239
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
234240
Stephen Hemminger <shemminger@osdl.org>

‎CREDITS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18
16371637
S: D-69126 Heidelberg
16381638
S: Germany
16391639

1640+
N: Simon Horman
1641+
M: horms@verge.net.au
1642+
D: Renesas ARM/ARM64 SoC maintainer
1643+
16401644
N: Christopher Horn
16411645
E: chorn@warwick.net
16421646
D: Miscellaneous sysctl hacks

‎Documentation/ABI/testing/ima_policy‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Description:
3737
euid:= decimal value
3838
fowner:= decimal value
3939
lsm: are LSM specific
40-
option: appraise_type:= [imasig]
40+
option: appraise_type:= [imasig] [imasig|modsig]
4141
template:= name of a defined IMA template type
4242
(eg, ima-ng). Only valid when action is "measure".
4343
pcr:= decimal value
@@ -105,3 +105,7 @@ Description:
105105

106106
measure func=KEXEC_KERNEL_CHECK pcr=4
107107
measure func=KEXEC_INITRAMFS_CHECK pcr=5
108+
109+
Example of appraise rule allowing modsig appended signatures:
110+
111+
appraise func=KEXEC_KERNEL_CHECK appraise_type=imasig|modsig

‎Documentation/ABI/testing/procfs-diskstats‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,9 @@ Description:
2929
17 - sectors discarded
3030
18 - time spent discarding
3131

32+
Kernel 5.5+ appends two more fields for flush requests:
33+
34+
19 - flush requests completed successfully
35+
20 - time spent flushing
36+
3237
For more details refer to Documentation/admin-guide/iostats.rst

‎Documentation/ABI/testing/sysfs-block‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ Description:
1515
9 - I/Os currently in progress
1616
10 - time spent doing I/Os (ms)
1717
11 - weighted time spent doing I/Os (ms)
18+
12 - discards completed
19+
13 - discards merged
20+
14 - sectors discarded
21+
15 - time spent discarding (ms)
22+
16 - flush requests completed
23+
17 - time spent flushing (ms)
1824
For more details refer Documentation/admin-guide/iostats.rst
1925

2026

‎Documentation/ABI/testing/sysfs-class-backlight‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
What: /sys/class/backlight/<backlight>/scale
2+
Date: July 2019
3+
KernelVersion: 5.4
4+
Contact: Daniel Thompson <daniel.thompson@linaro.org>
5+
Description:
6+
Description of the scale of the brightness curve.
7+
8+
The human eye senses brightness approximately logarithmically,
9+
hence linear changes in brightness are perceived as being
10+
non-linear. To achieve a linear perception of brightness changes
11+
controls like sliders need to apply a logarithmic mapping for
12+
backlights with a linear brightness curve.
13+
14+
Possible values of the attribute are:
15+
16+
unknown
17+
The scale of the brightness curve is unknown.
18+
19+
linear
20+
The brightness changes linearly with each step. Brightness
21+
controls should apply a logarithmic mapping for a linear
22+
perception.
23+
24+
non-linear
25+
The brightness changes non-linearly with each step. Brightness
26+
controls should use a linear mapping for a linear perception.

‎Documentation/ABI/testing/sysfs-class-watchdog‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,37 @@ Description:
7272
It is a read/write file. When read, the currently assigned
7373
pretimeout governor is returned. When written, it sets
7474
the pretimeout governor.
75+
76+
What: /sys/class/watchdog/watchdog1/access_cs0
77+
Date: August 2019
78+
Contact: Ivan Mikhaylov <i.mikhaylov@yadro.com>,
79+
Alexander Amelkin <a.amelkin@yadro.com>
80+
Description:
81+
It is a read/write file. This attribute exists only if the
82+
system has booted from the alternate flash chip due to
83+
expiration of a watchdog timer of AST2400/AST2500 when
84+
alternate boot function was enabled with 'aspeed,alt-boot'
85+
devicetree option for that watchdog or with an appropriate
86+
h/w strapping (for WDT2 only).
87+
88+
At alternate flash the 'access_cs0' sysfs node provides:
89+
ast2400: a way to get access to the primary SPI flash
90+
chip at CS0 after booting from the alternate
91+
chip at CS1.
92+
ast2500: a way to restore the normal address mapping
93+
from (CS0->CS1, CS1->CS0) to (CS0->CS0,
94+
CS1->CS1).
95+
96+
Clearing the boot code selection and timeout counter also
97+
resets to the initial state the chip select line mapping. When
98+
the SoC is in normal mapping state (i.e. booted from CS0),
99+
clearing those bits does nothing for both versions of the SoC.
100+
For alternate boot mode (booted from CS1 due to wdt2
101+
expiration) the behavior differs as described above.
102+
103+
This option can be used with wdt2 (watchdog1) only.
104+
105+
When read, the current status of the boot code selection is
106+
shown. When written with any non-zero value, it clears
107+
the boot code selection and the timeout counter, which results
108+
in chipselect reset for AST2400/AST2500.

‎Documentation/ABI/testing/sysfs-devices-system-cpu‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,8 @@ What: /sys/devices/system/cpu/vulnerabilities
486486
/sys/devices/system/cpu/vulnerabilities/spec_store_bypass
487487
/sys/devices/system/cpu/vulnerabilities/l1tf
488488
/sys/devices/system/cpu/vulnerabilities/mds
489+
/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
490+
/sys/devices/system/cpu/vulnerabilities/itlb_multihit
489491
Date: January 2018
490492
Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
491493
Description: Information about CPU vulnerabilities

‎Documentation/ABI/testing/sysfs-kernel-slab‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,15 @@ KernelVersion: 2.6.22
429429
Contact: Pekka Enberg <penberg@cs.helsinki.fi>,
430430
Christoph Lameter <cl@linux-foundation.org>
431431
Description:
432-
The shrink file is written when memory should be reclaimed from
433-
a cache. Empty partial slabs are freed and the partial list is
434-
sorted so the slabs with the fewest available objects are used
435-
first.
432+
The shrink file is used to reclaim unused slab cache
433+
memory from a cache. Empty per-cpu or partial slabs
434+
are freed and the partial list is sorted so the slabs
435+
with the fewest available objects are used first.
436+
It only accepts a value of "1" on write for shrinking
437+
the cache. Other input values are considered invalid.
438+
Shrinking slab caches might be expensive and can
439+
adversely impact other running applications. So it
440+
should be used with care.
436441

437442
What: /sys/kernel/slab/cache/slab_size
438443
Date: May 2007

‎Documentation/admin-guide/cgroup-v1/memory.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@ Brief summary of control files.
8585
memory.oom_control set/show oom controls.
8686
memory.numa_stat show the number of memory usage per numa
8787
node
88-
8988
memory.kmem.limit_in_bytes set/show hard limit for kernel memory
89+
This knob is deprecated and shouldn't be
90+
used. It is planned that this be removed in
91+
the foreseeable future.
9092
memory.kmem.usage_in_bytes show current kernel memory allocation
9193
memory.kmem.failcnt show the number of kernel memory usage
9294
hits limits

0 commit comments

Comments
 (0)