Skip to content

Commit 63b6f0b

Browse files
author
Jiri Kosina
committed
Merge branches 'for-5.1/upstream-fixes', 'for-5.2/core', 'for-5.2/ish', 'for-5.2/logitech', 'for-5.2/macally', 'for-5.2/picolcd', 'for-5.2/sensor' and 'for-5.2/u2fzero' into for-linus
8 parents 39b3c3a + 4ceabaf + 2eb3c3e + 640d4ea + 161f62c + 70cd812 + 77f9f77 + 59579a8 commit 63b6f0b

File tree

4,141 files changed

+138413
-78429
lines changed

Some content is hidden

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

4,141 files changed

+138413
-78429
lines changed

‎.clang-format

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ ForEachMacros:
240240
- 'for_each_set_bit'
241241
- 'for_each_set_bit_from'
242242
- 'for_each_sg'
243+
- 'for_each_sg_dma_page'
243244
- 'for_each_sg_page'
244245
- 'for_each_sibling_event'
245246
- '__for_each_thread'
@@ -289,7 +290,6 @@ ForEachMacros:
289290
- 'idr_for_each_entry_ul'
290291
- 'inet_bind_bucket_for_each'
291292
- 'inet_lhash2_for_each_icsk_rcu'
292-
- 'iov_for_each'
293293
- 'key_for_each'
294294
- 'key_for_each_safe'
295295
- 'klp_for_each_func'
@@ -360,6 +360,7 @@ ForEachMacros:
360360
- 'radix_tree_for_each_slot'
361361
- 'radix_tree_for_each_tagged'
362362
- 'rbtree_postorder_for_each_entry_safe'
363+
- 'rdma_for_each_port'
363364
- 'resource_list_for_each_entry'
364365
- 'resource_list_for_each_entry_safe'
365366
- 'rhl_for_each_entry_rcu'

‎.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ Morten Welinder <[email protected]>
156156
Morten Welinder <[email protected]>
157157
Mythri P K <[email protected]>
158158
Nguyen Anh Quynh <[email protected]>
159+
Nicolas Pitre <[email protected]> <[email protected]>
160+
Nicolas Pitre <[email protected]> <[email protected]>
159161
Paolo 'Blaisorblade' Giarrusso <[email protected]>
160162
Patrick Mochel <[email protected]>
161163
Paul Burton <[email protected]> <[email protected]>
@@ -224,3 +226,5 @@ Yakir Yang <[email protected]> <[email protected]>
224226
Yusuke Goda <[email protected]>
225227
Gustavo Padovan <[email protected]>
226228
Gustavo Padovan <[email protected]>
229+
Changbin Du <[email protected]> <[email protected]>
230+
Changbin Du <[email protected]> <[email protected]>

‎Documentation/ABI/obsolete/sysfs-class-dax

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
What: /sys/class/dax/
2+
Date: May, 2016
3+
KernelVersion: v4.7
4+
Contact: [email protected]
5+
Description: Device DAX is the device-centric analogue of Filesystem
6+
DAX (CONFIG_FS_DAX). It allows memory ranges to be
7+
allocated and mapped without need of an intervening file
8+
system. Device DAX is strict, precise and predictable.
9+
Specifically this interface:
10+
11+
1/ Guarantees fault granularity with respect to a given
12+
page size (pte, pmd, or pud) set at configuration time.
13+
14+
2/ Enforces deterministic behavior by being strict about
15+
what fault scenarios are supported.
16+
17+
The /sys/class/dax/ interface enumerates all the
18+
device-dax instances in the system. The ABI is
19+
deprecated and will be removed after 2020. It is
20+
replaced with the DAX bus interface /sys/bus/dax/ where
21+
device-dax instances can be found under
22+
/sys/bus/dax/devices/

‎Documentation/ABI/stable/sysfs-driver-mlxreg-io

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,19 @@ Description: These files show with which CPLD versions have been burned
2121
The files are read only.
2222

2323
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
24-
cpld3_version
24+
fan_dir
25+
26+
Date: December 2018
27+
KernelVersion: 5.0
28+
Contact: Vadim Pasternak <vadimpmellanox.com>
29+
Description: This file shows the system fans direction:
30+
forward direction - relevant bit is set 0;
31+
reversed direction - relevant bit is set 1.
32+
33+
The files are read only.
34+
35+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
36+
jtag_enable
2537

2638
Date: November 2018
2739
KernelVersion: 5.0

‎Documentation/ABI/testing/debugfs-wilco-ec

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
What: /sys/kernel/debug/wilco_ec/raw
2+
Date: January 2019
3+
KernelVersion: 5.1
4+
Description:
5+
Write and read raw mailbox commands to the EC.
6+
7+
For writing:
8+
Bytes 0-1 indicate the message type:
9+
00 F0 = Execute Legacy Command
10+
00 F2 = Read/Write NVRAM Property
11+
Byte 2 provides the command code
12+
Bytes 3+ consist of the data passed in the request
13+
14+
At least three bytes are required, for the msg type and command,
15+
with additional bytes optional for additional data.
16+
17+
Example:
18+
// Request EC info type 3 (EC firmware build date)
19+
$ echo 00 f0 38 00 03 00 > raw
20+
// View the result. The decoded ASCII result "12/21/18" is
21+
// included after the raw hex.
22+
$ cat raw
23+
00 31 32 2f 32 31 2f 31 38 00 38 00 01 00 2f 00 .12/21/18.8...

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
What: /sys/class/chromeos/<ec-device-name>/flashinfo
2+
Date: August 2015
3+
KernelVersion: 4.2
4+
Description:
5+
Show the EC flash information.
6+
7+
What: /sys/class/chromeos/<ec-device-name>/kb_wake_angle
8+
Date: March 2018
9+
KernelVersion: 4.17
10+
Description:
11+
Control the keyboard wake lid angle. Values are between
12+
0 and 360. This file will also show the keyboard wake lid
13+
angle by querying the hardware.
14+
15+
What: /sys/class/chromeos/<ec-device-name>/reboot
16+
Date: August 2015
17+
KernelVersion: 4.2
18+
Description:
19+
Tell the EC to reboot in various ways. Options are:
20+
"cancel": Cancel a pending reboot.
21+
"ro": Jump to RO without rebooting.
22+
"rw": Jump to RW without rebooting.
23+
"cold": Cold reboot.
24+
"disable-jump": Disable jump until next reboot.
25+
"hibernate": Hibernate the EC.
26+
"at-shutdown": Reboot after an AP shutdown.
27+
28+
What: /sys/class/chromeos/<ec-device-name>/version
29+
Date: August 2015
30+
KernelVersion: 4.2
31+
Description:
32+
Show the information about the EC software and hardware.

‎Documentation/ABI/testing/sysfs-class-chromeos-driver-cros-ec-lightbar

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
What: /sys/class/chromeos/<ec-device-name>/lightbar/brightness
2+
Date: August 2015
3+
KernelVersion: 4.2
4+
Description:
5+
Writing to this file adjusts the overall brightness of
6+
the lightbar, separate from any color intensity. The
7+
valid range is 0 (off) to 255 (maximum brightness).
8+
9+
What: /sys/class/chromeos/<ec-device-name>/lightbar/interval_msec
10+
Date: August 2015
11+
KernelVersion: 4.2
12+
Description:
13+
The lightbar is controlled by an embedded controller (EC),
14+
which also manages the keyboard, battery charging, fans,
15+
and other system hardware. To prevent unprivileged users
16+
from interfering with the other EC functions, the rate at
17+
which the lightbar control files can be read or written is
18+
limited.
19+
20+
Reading this file will return the number of milliseconds
21+
that must elapse between accessing any of the lightbar
22+
functions through this interface. Going faster will simply
23+
block until the necessary interval has lapsed. The interval
24+
applies uniformly to all accesses of any kind by any user.
25+
26+
What: /sys/class/chromeos/<ec-device-name>/lightbar/led_rgb
27+
Date: August 2015
28+
KernelVersion: 4.2
29+
Description:
30+
This allows you to control each LED segment. If the
31+
lightbar is already running one of the automatic
32+
sequences, you probably won’t see anything change because
33+
your color setting will be almost immediately replaced.
34+
To get useful results, you should stop the lightbar
35+
sequence first.
36+
37+
The values written to this file are sets of four integers,
38+
indicating LED, RED, GREEN, BLUE. The LED number is 0 to 3
39+
to select a single segment, or 4 to set all four segments
40+
to the same value at once. The RED, GREEN, and BLUE
41+
numbers should be in the range 0 (off) to 255 (maximum).
42+
You can update more than one segment at a time by writing
43+
more than one set of four integers.
44+
45+
What: /sys/class/chromeos/<ec-device-name>/lightbar/program
46+
Date: August 2015
47+
KernelVersion: 4.2
48+
Description:
49+
This allows you to upload and run custom lightbar sequences.
50+
51+
What: /sys/class/chromeos/<ec-device-name>/lightbar/sequence
52+
Date: August 2015
53+
KernelVersion: 4.2
54+
Description:
55+
The Pixel lightbar has a number of built-in sequences
56+
that it displays under various conditions, such as at
57+
power on, shut down, or while running. Reading from this
58+
file displays the current sequence that the lightbar is
59+
displaying. Writing to this file allows you to change the
60+
sequence.
61+
62+
What: /sys/class/chromeos/<ec-device-name>/lightbar/userspace_control
63+
Date: August 2015
64+
KernelVersion: 4.2
65+
Description:
66+
This allows you to take the control of the lightbar. This
67+
prevents the kernel from going through its normal
68+
sequences.
69+
70+
What: /sys/class/chromeos/<ec-device-name>/lightbar/version
71+
Date: August 2015
72+
KernelVersion: 4.2
73+
Description:
74+
Show the information about the lightbar version.

‎Documentation/ABI/testing/sysfs-class-chromeos-driver-cros-ec-vbc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
What: /sys/class/chromeos/<ec-device-name>/vbc/vboot_context
2+
Date: October 2015
3+
KernelVersion: 4.4
4+
Description:
5+
Read/write the verified boot context data included on a
6+
small nvram space on some EC implementations.

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,26 @@ Contact: Wim Van Sebroeck <[email protected]>
4949
Description:
5050
It is a read only file. It is read to know about current
5151
value of timeout programmed.
52+
53+
What: /sys/class/watchdog/watchdogn/pretimeout
54+
Date: December 2016
55+
Contact: Wim Van Sebroeck <[email protected]>
56+
Description:
57+
It is a read only file. It specifies the time in seconds before
58+
timeout when the pretimeout interrupt is delivered. Pretimeout
59+
is an optional feature.
60+
61+
What: /sys/class/watchdog/watchdogn/pretimeout_avaialable_governors
62+
Date: February 2017
63+
Contact: Wim Van Sebroeck <[email protected]>
64+
Description:
65+
It is a read only file. It shows the pretimeout governors
66+
available for this watchdog.
67+
68+
What: /sys/class/watchdog/watchdogn/pretimeout_governor
69+
Date: February 2017
70+
Contact: Wim Van Sebroeck <[email protected]>
71+
Description:
72+
It is a read/write file. When read, the currently assigned
73+
pretimeout governor is returned. When written, it sets
74+
the pretimeout governor.

‎Documentation/ABI/testing/sysfs-fs-ext4

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,10 @@ Description:
109109
write operation (since a 4k random write might turn
110110
into a much larger write due to the zeroout
111111
operation).
112+
113+
What: /sys/fs/ext4/<disk>/journal_task
114+
Date: February 2019
115+
Contact: "Theodore Ts'o" <[email protected]>
116+
Description:
117+
This file is read-only and shows the pid of journal thread in
118+
current pid-namespace or 0 if task is unreachable.

‎Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@ Description:
8686
The unit size is one block, now only support configuring in range
8787
of [1, 512].
8888

89+
What: /sys/fs/f2fs/<disk>/umount_discard_timeout
90+
Date: January 2019
91+
Contact: "Jaegeuk Kim" <[email protected]>
92+
Description:
93+
Set timeout to issue discard commands during umount.
94+
Default: 5 secs
95+
8996
What: /sys/fs/f2fs/<disk>/max_victim_search
9097
Date: January 2014
9198
Contact: "Jaegeuk Kim" <[email protected]>

0 commit comments

Comments
 (0)