Skip to content

Commit 51a8f52

Browse files
authored
Merge pull request torvalds#455 from libos-nuse/merge-4.18
Merge 4.18
2 parents 2c7da39 + fe55eb5 commit 51a8f52

File tree

13,017 files changed

+542056
-640685
lines changed

Some content is hidden

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

13,017 files changed

+542056
-640685
lines changed

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ Uwe Kleine-König <[email protected]>
186186
Uwe Kleine-König <[email protected]>
187187
Uwe Kleine-König <[email protected]>
188188
Valdis Kletnieks <[email protected]>
189+
190+
191+
189192
190193
191194

Documentation/00-INDEX

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ auxdisplay/
6464
- misc. LCD driver documentation (cfag12864b, ks0108).
6565
backlight/
6666
- directory with info on controlling backlights in flat panel displays
67-
bcache.txt
68-
- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.
6967
block/
7068
- info on the Block I/O (BIO) layer.
7169
blockdev/
@@ -78,18 +76,10 @@ bus-devices/
7876
- directory with info on TI GPMC (General Purpose Memory Controller)
7977
bus-virt-phys-mapping.txt
8078
- how to access I/O mapped memory from within device drivers.
81-
cachetlb.txt
82-
- describes the cache/TLB flushing interfaces Linux uses.
8379
cdrom/
8480
- directory with information on the CD-ROM drivers that Linux has.
8581
cgroup-v1/
8682
- cgroups v1 features, including cpusets and memory controller.
87-
cgroup-v2.txt
88-
- cgroups v2 features, including cpusets and memory controller.
89-
circular-buffers.txt
90-
- how to make use of the existing circular buffer infrastructure
91-
clk.txt
92-
- info on the common clock framework
9383
cma/
9484
- Continuous Memory Area (CMA) debugfs interface.
9585
conf.py

Documentation/ABI/obsolete/sysfs-gpio

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Description:
1111
Kernel code may export it for complete or partial access.
1212

1313
GPIOs are identified as they are inside the kernel, using integers in
14-
the range 0..INT_MAX. See Documentation/gpio/gpio.txt for more information.
14+
the range 0..INT_MAX. See Documentation/gpio for more information.
1515

1616
/sys/class/gpio
1717
/export ... asks the kernel to export a GPIO to userspace
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
What: /sys/bus/nd/devices/regionX/nfit/ecc_unit_size
2+
Date: Aug, 2017
3+
KernelVersion: v4.14 (Removed v4.18)
4+
5+
Description:
6+
(RO) Size of a write request to a DIMM that will not incur a
7+
read-modify-write cycle at the memory controller.
8+
9+
When the nfit driver initializes it runs an ARS (Address Range
10+
Scrub) operation across every pmem range. Part of that process
11+
involves determining the ARS capabilities of a given address
12+
range. One of the capabilities that is reported is the 'Clear
13+
Uncorrectable Error Range Length Unit Size' (see: ACPI 6.2
14+
section 9.20.7.4 Function Index 1 - Query ARS Capabilities).
15+
This property indicates the boundary at which the NVDIMM may
16+
need to perform read-modify-write cycles to maintain ECC (Error
17+
Correcting Code) blocks.

Documentation/ABI/stable/sysfs-bus-vmbus

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
What: /sys/bus/vmbus/devices/vmbus_*/id
1+
What: /sys/bus/vmbus/devices/<UUID>/id
22
Date: Jul 2009
33
KernelVersion: 2.6.31
44
Contact: K. Y. Srinivasan <[email protected]>
55
Description: The VMBus child_relid of the device's primary channel
66
Users: tools/hv/lsvmbus
77

8-
What: /sys/bus/vmbus/devices/vmbus_*/class_id
8+
What: /sys/bus/vmbus/devices/<UUID>/class_id
99
Date: Jul 2009
1010
KernelVersion: 2.6.31
1111
Contact: K. Y. Srinivasan <[email protected]>
1212
Description: The VMBus interface type GUID of the device
1313
Users: tools/hv/lsvmbus
1414

15-
What: /sys/bus/vmbus/devices/vmbus_*/device_id
15+
What: /sys/bus/vmbus/devices/<UUID>/device_id
1616
Date: Jul 2009
1717
KernelVersion: 2.6.31
1818
Contact: K. Y. Srinivasan <[email protected]>
1919
Description: The VMBus interface instance GUID of the device
2020
Users: tools/hv/lsvmbus
2121

22-
What: /sys/bus/vmbus/devices/vmbus_*/channel_vp_mapping
22+
What: /sys/bus/vmbus/devices/<UUID>/channel_vp_mapping
2323
Date: Jul 2015
2424
KernelVersion: 4.2.0
2525
Contact: K. Y. Srinivasan <[email protected]>
@@ -28,112 +28,112 @@ Description: The mapping of which primary/sub channels are bound to which
2828
Format: <channel's child_relid:the bound cpu's number>
2929
Users: tools/hv/lsvmbus
3030

31-
What: /sys/bus/vmbus/devices/vmbus_*/device
31+
What: /sys/bus/vmbus/devices/<UUID>/device
3232
Date: Dec. 2015
3333
KernelVersion: 4.5
3434
Contact: K. Y. Srinivasan <[email protected]>
3535
Description: The 16 bit device ID of the device
3636
Users: tools/hv/lsvmbus and user level RDMA libraries
3737

38-
What: /sys/bus/vmbus/devices/vmbus_*/vendor
38+
What: /sys/bus/vmbus/devices/<UUID>/vendor
3939
Date: Dec. 2015
4040
KernelVersion: 4.5
4141
Contact: K. Y. Srinivasan <[email protected]>
4242
Description: The 16 bit vendor ID of the device
4343
Users: tools/hv/lsvmbus and user level RDMA libraries
4444

45-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN
45+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>
4646
Date: September. 2017
4747
KernelVersion: 4.14
4848
Contact: Stephen Hemminger <[email protected]>
4949
Description: Directory for per-channel information
5050
NN is the VMBUS relid associtated with the channel.
5151

52-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/cpu
52+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu
5353
Date: September. 2017
5454
KernelVersion: 4.14
5555
Contact: Stephen Hemminger <[email protected]>
5656
Description: VCPU (sub)channel is affinitized to
5757
Users: tools/hv/lsvmbus and other debugging tools
5858

59-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/cpu
59+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu
6060
Date: September. 2017
6161
KernelVersion: 4.14
6262
Contact: Stephen Hemminger <[email protected]>
6363
Description: VCPU (sub)channel is affinitized to
6464
Users: tools/hv/lsvmbus and other debugging tools
6565

66-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/in_mask
66+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/in_mask
6767
Date: September. 2017
6868
KernelVersion: 4.14
6969
Contact: Stephen Hemminger <[email protected]>
7070
Description: Host to guest channel interrupt mask
7171
Users: Debugging tools
7272

73-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/latency
73+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/latency
7474
Date: September. 2017
7575
KernelVersion: 4.14
7676
Contact: Stephen Hemminger <[email protected]>
7777
Description: Channel signaling latency
7878
Users: Debugging tools
7979

80-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/out_mask
80+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/out_mask
8181
Date: September. 2017
8282
KernelVersion: 4.14
8383
Contact: Stephen Hemminger <[email protected]>
8484
Description: Guest to host channel interrupt mask
8585
Users: Debugging tools
8686

87-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/pending
87+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/pending
8888
Date: September. 2017
8989
KernelVersion: 4.14
9090
Contact: Stephen Hemminger <[email protected]>
9191
Description: Channel interrupt pending state
9292
Users: Debugging tools
9393

94-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/read_avail
94+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/read_avail
9595
Date: September. 2017
9696
KernelVersion: 4.14
9797
Contact: Stephen Hemminger <[email protected]>
9898
Description: Bytes available to read
9999
Users: Debugging tools
100100

101-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/write_avail
101+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/write_avail
102102
Date: September. 2017
103103
KernelVersion: 4.14
104104
Contact: Stephen Hemminger <[email protected]>
105105
Description: Bytes available to write
106106
Users: Debugging tools
107107

108-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/events
108+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/events
109109
Date: September. 2017
110110
KernelVersion: 4.14
111111
Contact: Stephen Hemminger <[email protected]>
112112
Description: Number of times we have signaled the host
113113
Users: Debugging tools
114114

115-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/interrupts
115+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/interrupts
116116
Date: September. 2017
117117
KernelVersion: 4.14
118118
Contact: Stephen Hemminger <[email protected]>
119119
Description: Number of times we have taken an interrupt (incoming)
120120
Users: Debugging tools
121121

122-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/subchannel_id
122+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/subchannel_id
123123
Date: January. 2018
124124
KernelVersion: 4.16
125125
Contact: Stephen Hemminger <[email protected]>
126126
Description: Subchannel ID associated with VMBUS channel
127127
Users: Debugging tools and userspace drivers
128128

129-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/monitor_id
129+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/monitor_id
130130
Date: January. 2018
131131
KernelVersion: 4.16
132132
Contact: Stephen Hemminger <[email protected]>
133133
Description: Monitor bit associated with channel
134134
Users: Debugging tools and userspace drivers
135135

136-
What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/ring
136+
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/ring
137137
Date: January. 2018
138138
KernelVersion: 4.16
139139
Contact: Stephen Hemminger <[email protected]>

Documentation/ABI/stable/sysfs-devices-node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ Date: December 2009
9090
Contact: Lee Schermerhorn <[email protected]>
9191
Description:
9292
The node's huge page size control/query attributes.
93-
See Documentation/vm/hugetlbpage.txt
93+
See Documentation/admin-guide/mm/hugetlbpage.rst

Documentation/ABI/testing/evm

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,16 @@ Description:
5757
dracut (via 97masterkey and 98integrity) and systemd (via
5858
core/ima-setup) have support for loading keys at boot
5959
time.
60+
61+
What: security/integrity/evm/evm_xattrs
62+
Date: April 2018
63+
Contact: Matthew Garrett <[email protected]>
64+
Description:
65+
Shows the set of extended attributes used to calculate or
66+
validate the EVM signature, and allows additional attributes
67+
to be added at runtime. Any signatures generated after
68+
additional attributes are added (and on files posessing those
69+
additional attributes) will only be valid if the same
70+
additional attributes are configured on system boot. Writing
71+
a single period (.) will lock the xattr list from any further
72+
modification.

Documentation/ABI/testing/ima_policy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Description:
2121
audit | hash | dont_hash
2222
condition:= base | lsm [option]
2323
base: [[func=] [mask=] [fsmagic=] [fsuuid=] [uid=]
24-
[euid=] [fowner=]]
24+
[euid=] [fowner=] [fsname=]]
2525
lsm: [[subj_user=] [subj_role=] [subj_type=]
2626
[obj_user=] [obj_role=] [obj_type=]]
2727
option: [[appraise_type=]] [permit_directio]

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,13 @@ Description:
190190
but should match other such assignments on device).
191191
Units after application of scale and offset are m/s^2.
192192

193+
What: /sys/bus/iio/devices/iio:deviceX/in_angl_raw
194+
KernelVersion: 4.17
195+
196+
Description:
197+
Angle of rotation. Units after application of scale and offset
198+
are radians.
199+
193200
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_x_raw
194201
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_raw
195202
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_raw
@@ -297,6 +304,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_pressure_offset
297304
What: /sys/bus/iio/devices/iio:deviceX/in_humidityrelative_offset
298305
What: /sys/bus/iio/devices/iio:deviceX/in_magn_offset
299306
What: /sys/bus/iio/devices/iio:deviceX/in_rot_offset
307+
What: /sys/bus/iio/devices/iio:deviceX/in_angl_offset
300308
KernelVersion: 2.6.35
301309
302310
Description:
@@ -350,6 +358,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_humidityrelative_scale
350358
What: /sys/bus/iio/devices/iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_scale
351359
What: /sys/bus/iio/devices/iio:deviceX/in_illuminance_scale
352360
What: /sys/bus/iio/devices/iio:deviceX/in_countY_scale
361+
What: /sys/bus/iio/devices/iio:deviceX/in_angl_scale
353362
KernelVersion: 2.6.35
354363
355364
Description:

Documentation/ABI/testing/sysfs-bus-nfit

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -212,22 +212,3 @@ Description:
212212
range. Used by NVDIMM Region Mapping Structure to uniquely refer
213213
to this structure. Value of 0 is reserved and not used as an
214214
index.
215-
216-
217-
What: /sys/bus/nd/devices/regionX/nfit/ecc_unit_size
218-
Date: Aug, 2017
219-
KernelVersion: v4.14
220-
221-
Description:
222-
(RO) Size of a write request to a DIMM that will not incur a
223-
read-modify-write cycle at the memory controller.
224-
225-
When the nfit driver initializes it runs an ARS (Address Range
226-
Scrub) operation across every pmem range. Part of that process
227-
involves determining the ARS capabilities of a given address
228-
range. One of the capabilities that is reported is the 'Clear
229-
Uncorrectable Error Range Length Unit Size' (see: ACPI 6.2
230-
section 9.20.7.4 Function Index 1 - Query ARS Capabilities).
231-
This property indicates the boundary at which the NVDIMM may
232-
need to perform read-modify-write cycles to maintain ECC (Error
233-
Correcting Code) blocks.

Documentation/ABI/testing/sysfs-bus-rpmsg

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,23 @@ Description:
7373
This sysfs entry tells us whether the channel is a local
7474
server channel that is announced (values are either
7575
true or false).
76+
77+
What: /sys/bus/rpmsg/devices/.../driver_override
78+
Date: April 2018
79+
KernelVersion: 4.18
80+
Contact: Bjorn Andersson <[email protected]>
81+
Description:
82+
Every rpmsg device is a communication channel with a remote
83+
processor. Channels are identified by a textual name (see
84+
/sys/bus/rpmsg/devices/.../name above) and have a local
85+
("source") rpmsg address, and remote ("destination") rpmsg
86+
address.
87+
88+
The listening entity (or client) which communicates with a
89+
remote processor is referred as rpmsg driver. The rpmsg device
90+
and rpmsg driver are matched based on rpmsg device name and
91+
rpmsg driver ID table.
92+
93+
This sysfs entry allows the rpmsg driver for a rpmsg device
94+
to be specified which will override standard OF, ID table
95+
and name matching.

Documentation/ABI/testing/sysfs-bus-usb

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,28 @@ Description:
189189
The file will read "hotplug", "wired" and "not used" if the
190190
information is available, and "unknown" otherwise.
191191

192+
What: /sys/bus/usb/devices/.../(hub interface)/portX/quirks
193+
Date: May 2018
194+
Contact: Nicolas Boichat <[email protected]>
195+
Description:
196+
In some cases, we care about time-to-active for devices
197+
connected on a specific port (e.g. non-standard USB port like
198+
pogo pins), where the device to be connected is known in
199+
advance, and behaves well according to the specification.
200+
This attribute is a bit-field that controls the behavior of
201+
a specific port:
202+
- Bit 0 of this field selects the "old" enumeration scheme,
203+
as it is considerably faster (it only causes one USB reset
204+
instead of 2).
205+
The old enumeration scheme can also be selected globally
206+
using /sys/module/usbcore/parameters/old_scheme_first, but
207+
it is often not desirable as the new scheme was introduced to
208+
increase compatibility with more devices.
209+
- Bit 1 reduces TRSTRCY to the 10 ms that are required by the
210+
USB 2.0 specification, instead of the 50 ms that are normally
211+
used to help make enumeration work better on some high speed
212+
devices.
213+
192214
What: /sys/bus/usb/devices/.../(hub interface)/portX/over_current_count
193215
Date: February 2018
194216
Contact: Richard Leitner <[email protected]>
@@ -236,3 +258,21 @@ Description:
236258
Supported values are 0 - 15.
237259
More information on how besl values map to microseconds can be found in
238260
USB 2.0 ECN Errata for Link Power Management, section 4.10)
261+
262+
What: /sys/bus/usb/devices/.../rx_lanes
263+
Date: March 2018
264+
Contact: Mathias Nyman <[email protected]>
265+
Description:
266+
Number of rx lanes the device is using.
267+
USB 3.2 adds Dual-lane support, 2 rx and 2 tx lanes over Type-C.
268+
Inter-Chip SSIC devices support asymmetric lanes up to 4 lanes per
269+
direction. Devices before USB 3.2 are single lane (rx_lanes = 1)
270+
271+
What: /sys/bus/usb/devices/.../tx_lanes
272+
Date: March 2018
273+
Contact: Mathias Nyman <[email protected]>
274+
Description:
275+
Number of tx lanes the device is using.
276+
USB 3.2 adds Dual-lane support, 2 rx and 2 tx -lanes over Type-C.
277+
Inter-Chip SSIC devices support asymmetric lanes up to 4 lanes per
278+
direction. Devices before USB 3.2 are single lane (tx_lanes = 1)

Documentation/ABI/testing/sysfs-class-cxl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ Date: September 2014
6969
7070
Description: read/write
7171
Set the mode for prefaulting in segments into the segment table
72-
when performing the START_WORK ioctl. Possible values:
72+
when performing the START_WORK ioctl. Only applicable when
73+
running under hashed page table mmu.
74+
Possible values:
7375
none: No prefaulting (default)
7476
work_element_descriptor: Treat the work element
7577
descriptor as an effective address and

0 commit comments

Comments
 (0)