Skip to content

Commit 0c72442

Browse files
author
Jiri Kosina
committed
Merge branch 'master' into for-4.20/upstream-fixes
Pull in a merge commit that brought in 3b692c5 ("HID: asus: only support backlight when it's not driven by WMI") so that fixup could be applied on top of it.
2 parents 399474e + eb7046e commit 0c72442

File tree

6,656 files changed

+370263
-131575
lines changed

Some content is hidden

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

6,656 files changed

+370263
-131575
lines changed

‎.clang-format

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,6 @@ ForEachMacros:
323323
- 'protocol_for_each_card'
324324
- 'protocol_for_each_dev'
325325
- 'queue_for_each_hw_ctx'
326-
- 'radix_tree_for_each_contig'
327326
- 'radix_tree_for_each_slot'
328327
- 'radix_tree_for_each_tagged'
329328
- 'rbtree_postorder_for_each_entry_safe'

‎.mailmap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,13 @@ Mark Brown <broonie@sirena.org.uk>
119119
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
120120
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
121121
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
122+
Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
123+
Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
124+
Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>
125+
Matthew Wilcox <willy@infradead.org> <mawilcox@microsoft.com>
126+
Matthew Wilcox <willy@infradead.org> <willy@debian.org>
127+
Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>
128+
Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>
122129
Matthieu CASTET <castet.matthieu@free.fr>
123130
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
124131
Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
@@ -153,6 +160,11 @@ Peter Oruba <peter.oruba@amd.com>
153160
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
154161
Praveen BP <praveenbp@ti.com>
155162
Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
163+
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
164+
Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
165+
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
166+
Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
167+
Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
156168
Rajesh Shah <rajesh.shah@intel.com>
157169
Ralf Baechle <ralf@linux-mips.org>
158170
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

‎Documentation/ABI/stable/sysfs-driver-usb-usbtmc

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,3 @@ Description:
2525
4.2.2.
2626

2727
The files are read only.
28-
29-
30-
What: /sys/bus/usb/drivers/usbtmc/*/TermChar
31-
Date: August 2008
32-
Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
33-
Description:
34-
This file is the TermChar value to be sent to the USB TMC
35-
device as described by the document, "Universal Serial Bus Test
36-
and Measurement Class Specification
37-
(USBTMC) Revision 1.0" as published by the USB-IF.
38-
39-
Note that the TermCharEnabled file determines if this value is
40-
sent to the device or not.
41-
42-
43-
What: /sys/bus/usb/drivers/usbtmc/*/TermCharEnabled
44-
Date: August 2008
45-
Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
46-
Description:
47-
This file determines if the TermChar is to be sent to the
48-
device on every transaction or not. For more details about
49-
this, please see the document, "Universal Serial Bus Test and
50-
Measurement Class Specification (USBTMC) Revision 1.0" as
51-
published by the USB-IF.
52-
53-
54-
What: /sys/bus/usb/drivers/usbtmc/*/auto_abort
55-
Date: August 2008
56-
Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
57-
Description:
58-
This file determines if the transaction of the USB TMC
59-
device is to be automatically aborted if there is any error.
60-
For more details about this, please see the document,
61-
"Universal Serial Bus Test and Measurement Class Specification
62-
(USBTMC) Revision 1.0" as published by the USB-IF.

‎Documentation/ABI/testing/configfs-stp-policy-p_sys-t

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
What: /config/stp-policy/<device>:p_sys-t.<policy>/<node>/uuid
2+
Date: June 2018
3+
KernelVersion: 4.19
4+
Description:
5+
UUID source identifier string, RW.
6+
Default value is randomly generated at the mkdir <node> time.
7+
Data coming from trace sources that use this <node> will be
8+
tagged with this UUID in the MIPI SyS-T packet stream, to
9+
allow the decoder to discern between different sources
10+
within the same master/channel range, and identify the
11+
higher level decoders that may be needed for each source.
12+
13+
What: /config/stp-policy/<device>:p_sys-t.<policy>/<node>/do_len
14+
Date: June 2018
15+
KernelVersion: 4.19
16+
Description:
17+
Include payload length in the MIPI SyS-T header, boolean.
18+
If enabled, the SyS-T protocol encoder will include payload
19+
length in each packet's metadata. This is normally redundant
20+
if the underlying transport protocol supports marking message
21+
boundaries (which STP does), so this is off by default.
22+
23+
What: /config/stp-policy/<device>:p_sys-t.<policy>/<node>/ts_interval
24+
Date: June 2018
25+
KernelVersion: 4.19
26+
Description:
27+
Time interval in milliseconds. Include a timestamp in the
28+
MIPI SyS-T packet metadata, if this many milliseconds have
29+
passed since the previous packet from this source. Zero is
30+
the default and stands for "never send the timestamp".
31+
32+
What: /config/stp-policy/<device>:p_sys-t.<policy>/<node>/clocksync_interval
33+
Date: June 2018
34+
KernelVersion: 4.19
35+
Description:
36+
Time interval in milliseconds. Send a CLOCKSYNC packet if
37+
this many milliseconds have passed since the previous
38+
CLOCKSYNC packet from this source. Zero is the default and
39+
stands for "never send the CLOCKSYNC". It makes sense to
40+
use this option with sources that generate constant and/or
41+
periodic data, like stm_heartbeat.

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ Date: Dec 2014
1212
KernelVersion: 4.0
1313
Description: Control descriptors
1414

15+
All attributes read only:
16+
bInterfaceNumber - USB interface number for this
17+
streaming interface
18+
1519
What: /config/usb-gadget/gadget/functions/uvc.name/control/class
1620
Date: Dec 2014
1721
KernelVersion: 4.0
@@ -109,6 +113,10 @@ Date: Dec 2014
109113
KernelVersion: 4.0
110114
Description: Streaming descriptors
111115

116+
All attributes read only:
117+
bInterfaceNumber - USB interface number for this
118+
streaming interface
119+
112120
What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class
113121
Date: Dec 2014
114122
KernelVersion: 4.0
@@ -160,6 +168,10 @@ Description: Specific MJPEG format descriptors
160168

161169
All attributes read only,
162170
except bmaControls and bDefaultFrameIndex:
171+
bFormatIndex - unique id for this format descriptor;
172+
only defined after parent header is
173+
linked into the streaming class;
174+
read-only
163175
bmaControls - this format's data for bmaControls in
164176
the streaming header
165177
bmInterfaceFlags - specifies interlace information,
@@ -177,6 +189,10 @@ Date: Dec 2014
177189
KernelVersion: 4.0
178190
Description: Specific MJPEG frame descriptors
179191

192+
bFrameIndex - unique id for this framedescriptor;
193+
only defined after parent format is
194+
linked into the streaming header;
195+
read-only
180196
dwFrameInterval - indicates how frame interval can be
181197
programmed; a number of values
182198
separated by newline can be specified
@@ -204,6 +220,10 @@ Date: Dec 2014
204220
KernelVersion: 4.0
205221
Description: Specific uncompressed format descriptors
206222

223+
bFormatIndex - unique id for this format descriptor;
224+
only defined after parent header is
225+
linked into the streaming class;
226+
read-only
207227
bmaControls - this format's data for bmaControls in
208228
the streaming header
209229
bmInterfaceFlags - specifies interlace information,
@@ -224,6 +244,10 @@ Date: Dec 2014
224244
KernelVersion: 4.0
225245
Description: Specific uncompressed frame descriptors
226246

247+
bFrameIndex - unique id for this framedescriptor;
248+
only defined after parent format is
249+
linked into the streaming header;
250+
read-only
227251
dwFrameInterval - indicates how frame interval can be
228252
programmed; a number of values
229253
separated by newline can be specified

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Description:
199199

200200
What: /sys/bus/iio/devices/iio:deviceX/in_positionrelative_x_raw
201201
What: /sys/bus/iio/devices/iio:deviceX/in_positionrelative_y_raw
202-
KernelVersion: 4.18
202+
KernelVersion: 4.19
203203
Contact: linux-iio@vger.kernel.org
204204
Description:
205205
Relative position in direction x or y on a pad (may be

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,3 +323,27 @@ Description:
323323

324324
This is similar to /sys/bus/pci/drivers_autoprobe, but
325325
affects only the VFs associated with a specific PF.
326+
327+
What: /sys/bus/pci/devices/.../p2pmem/size
328+
Date: November 2017
329+
Contact: Logan Gunthorpe <logang@deltatee.com>
330+
Description:
331+
If the device has any Peer-to-Peer memory registered, this
332+
file contains the total amount of memory that the device
333+
provides (in decimal).
334+
335+
What: /sys/bus/pci/devices/.../p2pmem/available
336+
Date: November 2017
337+
Contact: Logan Gunthorpe <logang@deltatee.com>
338+
Description:
339+
If the device has any Peer-to-Peer memory registered, this
340+
file contains the amount of memory that has not been
341+
allocated (in decimal).
342+
343+
What: /sys/bus/pci/devices/.../p2pmem/published
344+
Date: November 2017
345+
Contact: Logan Gunthorpe <logang@deltatee.com>
346+
Description:
347+
If the device has any Peer-to-Peer memory registered, this
348+
file contains a '1' if the memory has been published for
349+
use outside the driver that owns the device.

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,16 @@ 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/location
193+
Date: October 2018
194+
Contact: Bjørn Mork <bjorn@mork.no>
195+
Description:
196+
Some platforms provide usb port physical location through
197+
firmware. This is used by the kernel to pair up logical ports
198+
mapping to the same physical connector. The attribute exposes the
199+
raw location value as a hex integer.
200+
201+
192202
What: /sys/bus/usb/devices/.../(hub interface)/portX/quirks
193203
Date: May 2018
194204
Contact: Nicolas Boichat <drinkcat@chromium.org>
@@ -219,7 +229,14 @@ Description:
219229
ports and report them to the kernel. This attribute is to expose
220230
the number of over-current situation occurred on a specific port
221231
to user space. This file will contain an unsigned 32 bit value
222-
which wraps to 0 after its maximum is reached.
232+
which wraps to 0 after its maximum is reached. This file supports
233+
poll() for monitoring changes to this value in user space.
234+
235+
Any time this value changes the corresponding hub device will send a
236+
udev event with the following attributes:
237+
238+
OVER_CURRENT_PORT=/sys/bus/usb/devices/.../(hub interface)/portX
239+
OVER_CURRENT_COUNT=[current value of this sysfs attribute]
223240

224241
What: /sys/bus/usb/devices/.../(hub interface)/portX/usb3_lpm_permit
225242
Date: November 2015

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/bus/vmbus/devices/.../driver_override
2+
Date: August 2019
3+
Contact: Stephen Hemminger <sthemmin@microsoft.com>
4+
Description:
5+
This file allows the driver for a device to be specified which
6+
will override standard static and dynamic ID matching. When
7+
specified, only a driver with a name matching the value written
8+
to driver_override will have an opportunity to bind to the
9+
device. The override is specified by writing a string to the
10+
driver_override file (echo uio_hv_generic > driver_override) and
11+
may be cleared with an empty string (echo > driver_override).
12+
This returns the device to standard matching rules binding.
13+
Writing to driver_override does not automatically unbind the
14+
device from its current driver or make any attempt to
15+
automatically load the specified driver. If no driver with a
16+
matching name is currently loaded in the kernel, the device
17+
will not bind to any driver. This also allows devices to
18+
opt-out of driver binding using a driver_override name such as
19+
"none". Only a single driver may be specified in the override,
20+
there is no support for parsing delimiters.
21+

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,24 @@ Description:
9191
stacked (e.g: VLAN interfaces) but still have the same MAC
9292
address as their parent device.
9393

94+
What: /sys/class/net/<iface>/dev_port
95+
Date: February 2014
96+
KernelVersion: 3.15
97+
Contact: netdev@vger.kernel.org
98+
Description:
99+
Indicates the port number of this network device, formatted
100+
as a decimal value. Some NICs have multiple independent ports
101+
on the same PCI bus, device and function. This attribute allows
102+
userspace to distinguish the respective interfaces.
103+
104+
Note: some device drivers started to use 'dev_id' for this
105+
purpose since long before 3.15 and have not adopted the new
106+
attribute ever since. To query the port number, some tools look
107+
exclusively at 'dev_port', while others only consult 'dev_id'.
108+
If a network device has multiple client adapter ports as
109+
described in the previous paragraph and does not set this
110+
attribute to its port number, it's a kernel bug.
111+
94112
What: /sys/class/net/<iface>/dormant
95113
Date: March 2006
96114
KernelVersion: 2.6.17

‎Documentation/ABI/testing/sysfs-platform-lg-laptop

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
What: /sys/devices/platform/lg-laptop/reader_mode
2+
Date: October 2018
3+
KernelVersion: 4.20
4+
Contact: "Matan Ziv-Av <matan@svgalib.org>
5+
Description:
6+
Control reader mode. 1 means on, 0 means off.
7+
8+
What: /sys/devices/platform/lg-laptop/fn_lock
9+
Date: October 2018
10+
KernelVersion: 4.20
11+
Contact: "Matan Ziv-Av <matan@svgalib.org>
12+
Description:
13+
Control FN lock mode. 1 means on, 0 means off.
14+
15+
What: /sys/devices/platform/lg-laptop/battery_care_limit
16+
Date: October 2018
17+
KernelVersion: 4.20
18+
Contact: "Matan Ziv-Av <matan@svgalib.org>
19+
Description:
20+
Maximal battery charge level. Accepted values are 80 or 100.
21+
22+
What: /sys/devices/platform/lg-laptop/fan_mode
23+
Date: October 2018
24+
KernelVersion: 4.20
25+
Contact: "Matan Ziv-Av <matan@svgalib.org>
26+
Description:
27+
Control fan mode. 1 for performance mode, 0 for silent mode.
28+
29+
What: /sys/devices/platform/lg-laptop/usb_charge
30+
Date: October 2018
31+
KernelVersion: 4.20
32+
Contact: "Matan Ziv-Av <matan@svgalib.org>
33+
Description:
34+
Control USB port charging when device is turned off.
35+
1 means on, 0 means off.

‎Documentation/PCI/endpoint/pci-test-howto.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,20 @@ Note that the devices listed here correspond to the value populated in 1.4 above
9999
2.2 Using Endpoint Test function Device
100100

101101
pcitest.sh added in tools/pci/ can be used to run all the default PCI endpoint
102-
tests. Before pcitest.sh can be used pcitest.c should be compiled using the
103-
following commands.
102+
tests. To compile this tool the following commands should be used:
104103

105-
cd <kernel-dir>
106-
make headers_install ARCH=arm
107-
arm-linux-gnueabihf-gcc -Iusr/include tools/pci/pcitest.c -o pcitest
108-
cp pcitest <rootfs>/usr/sbin/
109-
cp tools/pci/pcitest.sh <rootfs>
104+
# cd <kernel-dir>
105+
# make -C tools/pci
106+
107+
or if you desire to compile and install in your system:
108+
109+
# cd <kernel-dir>
110+
# make -C tools/pci install
111+
112+
The tool and script will be located in <rootfs>/usr/bin/
110113

111114
2.2.1 pcitest.sh Output
112-
# ./pcitest.sh
115+
# pcitest.sh
113116
BAR tests
114117

115118
BAR0: OKAY

0 commit comments

Comments
 (0)