Skip to content

Commit e42f6f9

Browse files
author
James Morris
committed
Merge tag 'v4.19-rc2' into next-general
Sync to Linux 4.19-rc2 for downstream developers.
2 parents 4408e30 + 5736184 commit e42f6f9

File tree

11,692 files changed

+542409
-235077
lines changed

Some content is hidden

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

11,692 files changed

+542409
-235077
lines changed

‎.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ IncludeIsMainRegex: '(Test)?$'
382382
IndentCaseLabels: false
383383
#IndentPPDirectives: None # Unknown to clang-format-5.0
384384
IndentWidth: 8
385-
IndentWrappedFunctionNames: true
385+
IndentWrappedFunctionNames: false
386386
JavaScriptQuotes: Leave
387387
JavaScriptWrapImports: true
388388
KeepEmptyLinesAtTheStartOfBlocks: false

‎.mailmap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Arnaud Patard <arnaud.patard@rtp-net.org>
3131
Arnd Bergmann <arnd@arndb.de>
3232
Axel Dyks <xl@xlsigned.net>
3333
Axel Lin <axel.lin@gmail.com>
34+
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
35+
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
3436
Ben Gardner <bgardner@wabtec.com>
3537
Ben M Cahill <ben.m.cahill@intel.com>
3638
Björn Steinbrink <B.Steinbrink@gmx.de>
@@ -81,6 +83,9 @@ Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
8183
<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
8284
Jean Tourrilhes <jt@hpl.hp.com>
8385
Jeff Garzik <jgarzik@pretzel.yyz.us>
86+
Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
87+
Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
88+
Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
8489
Jens Axboe <axboe@suse.de>
8590
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
8691
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
@@ -154,6 +159,7 @@ Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
154159
Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
155160
Rémi Denis-Courmont <rdenis@simphalempin.com>
156161
Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
162+
Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
157163
Rudolf Marek <R.Marek@sh.cvut.cz>
158164
Rui Saraiva <rmps@joel.ist.utl.pt>
159165
Sachin P Sant <ssant@in.ibm.com>

‎CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2571,6 +2571,11 @@ S: Helstorfer Str. 7
25712571
S: D-30625 Hannover
25722572
S: Germany
25732573

2574+
N: Ron Minnich
2575+
E: rminnich@sandia.gov
2576+
E: rminnich@gmail.com
2577+
D: 9p filesystem development
2578+
25742579
N: Corey Minyard
25752580
E: minyard@wf-rch.cirr.com
25762581
E: minyard@mvista.com

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
These files are deprecated and will be removed. The same files are available
2+
under /sys/bus/typec (see Documentation/ABI/testing/sysfs-bus-typec).
3+
4+
What: /sys/class/typec/<port|partner|cable>/<dev>/svid
5+
Date: April 2017
6+
Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
7+
Description:
8+
The SVID (Standard or Vendor ID) assigned by USB-IF for this
9+
alternate mode.
10+
11+
What: /sys/class/typec/<port|partner|cable>/<dev>/mode<index>/
12+
Date: April 2017
13+
Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
14+
Description:
15+
Every supported mode will have its own directory. The name of
16+
a mode will be "mode<index>" (for example mode1), where <index>
17+
is the actual index to the mode VDO returned by Discover Modes
18+
USB power delivery command.
19+
20+
What: /sys/class/typec/<port|partner|cable>/<dev>/mode<index>/description
21+
Date: April 2017
22+
Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
23+
Description:
24+
Shows description of the mode. The description is optional for
25+
the drivers, just like with the Billboard Devices.
26+
27+
What: /sys/class/typec/<port|partner|cable>/<dev>/mode<index>/vdo
28+
Date: April 2017
29+
Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
30+
Description:
31+
Shows the VDO in hexadecimal returned by Discover Modes command
32+
for this mode.
33+
34+
What: /sys/class/typec/<port|partner|cable>/<dev>/mode<index>/active
35+
Date: April 2017
36+
Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
37+
Description:
38+
Shows if the mode is active or not. The attribute can be used
39+
for entering/exiting the mode with partners and cable plugs, and
40+
with the port alternate modes it can be used for disabling
41+
support for specific alternate modes. Entering/exiting modes is
42+
supported as synchronous operation so write(2) to the attribute
43+
does not return until the enter/exit mode operation has
44+
finished. The attribute is notified when the mode is
45+
entered/exited so poll(2) on the attribute wakes up.
46+
Entering/exiting a mode will also generate uevent KOBJ_CHANGE.
47+
48+
Valid values: yes, no

‎Documentation/ABI/stable/sysfs-bus-vmbus

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ Contact: K. Y. Srinivasan <kys@microsoft.com>
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/<UUID>/numa_node
46+
Date: Jul 2018
47+
KernelVersion: 4.19
48+
Contact: Stephen Hemminger <sthemmin@microsoft.com>
49+
Description: This NUMA node to which the VMBUS device is
50+
attached, or -1 if the node is unknown.
51+
4552
What: /sys/bus/vmbus/devices/<UUID>/channels/<N>
4653
Date: September. 2017
4754
KernelVersion: 4.14

‎Documentation/ABI/stable/sysfs-bus-xen-backend

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,12 @@ KernelVersion: 3.0
7373
Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
7474
Description:
7575
Number of sectors written by the frontend.
76+
77+
What: /sys/bus/xen-backend/devices/*/state
78+
Date: August 2018
79+
KernelVersion: 4.19
80+
Contact: Joe Jin <joe.jin@oracle.com>
81+
Description:
82+
The state of the device. One of: 'Unknown',
83+
'Initialising', 'Initialised', 'Connected', 'Closing',
84+
'Closed', 'Reconfiguring', 'Reconfigured'.

‎Documentation/ABI/stable/sysfs-class-rfkill

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ KernelVersion: v2.6.22
1111
Contact: linux-wireless@vger.kernel.org,
1212
Description: The rfkill class subsystem folder.
1313
Each registered rfkill driver is represented by an rfkillX
14-
subfolder (X being an integer > 0).
14+
subfolder (X being an integer >= 0).
1515

1616

1717
What: /sys/class/rfkill/rfkill[0-9]+/name
@@ -48,8 +48,8 @@ Contact: linux-wireless@vger.kernel.org
4848
Description: Current state of the transmitter.
4949
This file was scheduled to be removed in 2014, but due to its
5050
large number of users it will be sticking around for a bit
51-
longer. Despite it being marked as stabe, the newer "hard" and
52-
"soft" interfaces should be preffered, since it is not possible
51+
longer. Despite it being marked as stable, the newer "hard" and
52+
"soft" interfaces should be preferred, since it is not possible
5353
to express the 'soft and hard block' state of the rfkill driver
5454
through this interface. There will likely be another attempt to
5555
remove it in the future.

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
2+
asic_health
3+
4+
Date: June 2018
5+
KernelVersion: 4.19
6+
Contact: Vadim Pasternak <vadimpmellanox.com>
7+
Description: This file shows ASIC health status. The possible values are:
8+
0 - health failed, 2 - health OK, 3 - ASIC in booting state.
9+
10+
The files are read only.
11+
12+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
13+
cpld1_version
14+
cpld2_version
15+
16+
Date: June 2018
17+
KernelVersion: 4.19
18+
Contact: Vadim Pasternak <vadimpmellanox.com>
19+
Description: These files show with which CPLD versions have been burned
20+
on carrier and switch boards.
21+
22+
The files are read only.
23+
24+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/select_iio
25+
Date: June 2018
26+
KernelVersion: 4.19
27+
Contact: Vadim Pasternak <vadimpmellanox.com>
28+
Description: This file allows iio devices selection.
29+
30+
Attribute select_iio can be written with 0 or with 1. It
31+
selects which one of iio devices can be accessed.
32+
33+
The file is read/write.
34+
35+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/psu1_on
36+
/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/psu2_on
37+
/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_cycle
38+
/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_down
39+
Date: June 2018
40+
KernelVersion: 4.19
41+
Contact: Vadim Pasternak <vadimpmellanox.com>
42+
Description: These files allow asserting system power cycling, switching
43+
power supply units on and off and system's main power domain
44+
shutdown.
45+
Expected behavior:
46+
When pwr_cycle is written 1: auxiliary power domain will go
47+
down and after short period (about 1 second) up.
48+
When psu1_on or psu2_on is written 1, related unit will be
49+
disconnected from the power source, when written 0 - connected.
50+
If both are written 1 - power supplies main power domain will
51+
go down.
52+
When pwr_down is written 1, system's main power domain will go
53+
down.
54+
55+
The files are write only.
56+
57+
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
58+
reset_aux_pwr_or_ref
59+
reset_asic_thermal
60+
reset_hotswap_or_halt
61+
reset_hotswap_or_wd
62+
reset_fw_reset
63+
reset_long_pb
64+
reset_main_pwr_fail
65+
reset_short_pb
66+
reset_sw_reset
67+
Date: June 2018
68+
KernelVersion: 4.19
69+
Contact: Vadim Pasternak <vadimpmellanox.com>
70+
Description: These files show the system reset cause, as following: power
71+
auxiliary outage or power refresh, ASIC thermal shutdown, halt,
72+
hotswap, watchdog, firmware reset, long press power button,
73+
short press power button, software reset. Value 1 in file means
74+
this is reset cause, 0 - otherwise. Only one of the above
75+
causes could be 1 at the same time, representing only last
76+
reset cause.
77+
78+
The files are read only.

‎Documentation/ABI/testing/configfs-usb-gadget-uvc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,3 +263,8 @@ Description: Specific streaming header descriptors
263263
is connected
264264
bmInfo - capabilities of this video streaming
265265
interface
266+
267+
What: /sys/class/udc/udc.name/device/gadget/video4linux/video.name/function_name
268+
Date: May 2018
269+
KernelVersion: 4.19
270+
Description: UVC configfs function instance name

‎Documentation/ABI/testing/ppc-memtrace

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ Contact: linuxppc-dev@lists.ozlabs.org
1313
Description: Write an integer containing the size in bytes of the memory
1414
you want removed from each NUMA node to this file - it must be
1515
aligned to the memblock size. This amount of RAM will be removed
16-
from the kernel mappings and the following debugfs files will be
17-
created. This can only be successfully done once per boot. Once
18-
memory is successfully removed from each node, the following
19-
files are created.
16+
from each NUMA node in the kernel mappings and the following
17+
debugfs files will be created. Once memory is successfully
18+
removed from each node, the following files are created. To
19+
re-add memory to the kernel, echo 0 into this file (it will be
20+
automatically onlined).
2021

2122
What: /sys/kernel/debug/powerpc/memtrace/<node-id>
2223
Date: Aug 2017

‎Documentation/ABI/testing/procfs-diskstats

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Description:
55
The /proc/diskstats file displays the I/O statistics
66
of block devices. Each line contains the following 14
77
fields:
8+
89
1 - major number
910
2 - minor mumber
1011
3 - device name
@@ -19,4 +20,13 @@ Description:
1920
12 - I/Os currently in progress
2021
13 - time spent doing I/Os (ms)
2122
14 - weighted time spent doing I/Os (ms)
23+
24+
Kernel 4.18+ appends four more fields for discard
25+
tracking putting the total at 18:
26+
27+
15 - discards completed successfully
28+
16 - discards merged
29+
17 - sectors discarded
30+
18 - time spent discarding
31+
2232
For more details refer to Documentation/iostats.txt

‎Documentation/ABI/testing/sysfs-bus-coresight-devices-tmc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,11 @@ KernelVersion: 4.7
8383
Contact: Mathieu Poirier <mathieu.poirier@linaro.org>
8484
Description: (R) Indicates the capabilities of the Coresight TMC.
8585
The value is read directly from the DEVID register, 0xFC8,
86+
87+
What: /sys/bus/coresight/devices/<memory_map>.tmc/buffer_size
88+
Date: December 2018
89+
KernelVersion: 4.19
90+
Contact: Mathieu Poirier <mathieu.poirier@linaro.org>
91+
Description: (RW) Size of the trace buffer for TMC-ETR when used in SYSFS
92+
mode. Writable only for TMC-ETR configurations. The value
93+
should be aligned to the kernel pagesize.

‎Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,18 @@ Description:
197197
Angle of rotation. Units after application of scale and offset
198198
are radians.
199199

200+
What: /sys/bus/iio/devices/iio:deviceX/in_positionrelative_x_raw
201+
What: /sys/bus/iio/devices/iio:deviceX/in_positionrelative_y_raw
202+
KernelVersion: 4.18
203+
Contact: linux-iio@vger.kernel.org
204+
Description:
205+
Relative position in direction x or y on a pad (may be
206+
arbitrarily assigned but should match other such assignments on
207+
device).
208+
Units after application of scale and offset are milli percents
209+
from the pad's size in both directions. Should be calibrated by
210+
the consumer.
211+
200212
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_x_raw
201213
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_raw
202214
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_raw
@@ -1295,13 +1307,16 @@ What: /sys/.../iio:deviceX/in_intensityY_raw
12951307
What: /sys/.../iio:deviceX/in_intensityY_ir_raw
12961308
What: /sys/.../iio:deviceX/in_intensityY_both_raw
12971309
What: /sys/.../iio:deviceX/in_intensityY_uv_raw
1310+
What: /sys/.../iio:deviceX/in_intensityY_duv_raw
12981311
KernelVersion: 3.4
12991312
Contact: linux-iio@vger.kernel.org
13001313
Description:
13011314
Unit-less light intensity. Modifiers both and ir indicate
13021315
that measurements contain visible and infrared light
1303-
components or just infrared light, respectively. Modifier uv indicates
1304-
that measurements contain ultraviolet light components.
1316+
components or just infrared light, respectively. Modifier
1317+
uv indicates that measurements contain ultraviolet light
1318+
components. Modifier duv indicates that measurements
1319+
contain deep ultraviolet light components.
13051320

13061321
What: /sys/.../iio:deviceX/in_uvindex_input
13071322
KernelVersion: 4.6
@@ -1663,3 +1678,10 @@ KernelVersion: 4.12
16631678
Contact: linux-iio@vger.kernel.org
16641679
Description:
16651680
Raw counter device counters direction for channel Y.
1681+
1682+
What: /sys/bus/iio/devices/iio:deviceX/in_phaseY_raw
1683+
KernelVersion: 4.18
1684+
Contact: linux-iio@vger.kernel.org
1685+
Description:
1686+
Raw (unscaled) phase difference reading from channel Y
1687+
that can be processed to radians.

‎Documentation/ABI/testing/sysfs-bus-iio-isl29501

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_agc_gain
2+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_agc_gain_bias
3+
KernelVersion: 4.18
4+
Contact: linux-iio@vger.kernel.org
5+
Description:
6+
This sensor has an automatic gain control (agc) loop
7+
which sets the analog signal levels at an optimum
8+
level by controlling programmable gain amplifiers. The
9+
criteria for optimal gain is determined by the sensor.
10+
11+
Return the actual gain value as an integer in [0; 65536]
12+
range when read from.
13+
14+
The agc gain read when measuring crosstalk shall be
15+
written into in_proximity0_agc_gain_bias.
16+
17+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_temp_a
18+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_temp_b
19+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_light_a
20+
What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calib_phase_light_b
21+
KernelVersion: 4.18
22+
Contact: linux-iio@vger.kernel.org
23+
Description:
24+
The sensor is able to perform correction of distance
25+
measurements due to changing temperature and ambient
26+
light conditions. It can be programmed to correct for
27+
a second order error polynomial.
28+
29+
Phase data has to be collected when temperature and
30+
ambient light are modulated independently.
31+
32+
Then a least squares curve fit to a second order
33+
polynomial has to be generated from the data. The
34+
resultant curves have the form ax^2 + bx + c.
35+
36+
From those two curves, a and b coefficients shall be
37+
stored in in_proximity0_calib_phase_temp_a and
38+
in_proximity0_calib_phase_temp_b for temperature and
39+
in in_proximity0_calib_phase_light_a and
40+
in_proximity0_calib_phase_light_b for ambient light.
41+
42+
Those values must be integer in [0; 8355840] range.
43+
44+
Finally, the c constant is set by the sensor
45+
internally.
46+
47+
The value stored in sensor is displayed when read from.

0 commit comments

Comments
 (0)