Skip to content

Commit 2c55d70

Browse files
committed
Merge drm/drm-fixes into drm-misc-fixes
Let's start the fixes cycle. Signed-off-by: Maxime Ripard <[email protected]>
2 parents 92d43bd + 88603b6 commit 2c55d70

File tree

13,348 files changed

+691999
-381405
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,348 files changed

+691999
-381405
lines changed

.clang-format

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ ForEachMacros:
222222
- 'for_each_component_dais'
223223
- 'for_each_component_dais_safe'
224224
- 'for_each_console'
225+
- 'for_each_console_srcu'
225226
- 'for_each_cpu'
226227
- 'for_each_cpu_and'
227228
- 'for_each_cpu_not'
@@ -440,8 +441,11 @@ ForEachMacros:
440441
- 'inet_lhash2_for_each_icsk'
441442
- 'inet_lhash2_for_each_icsk_continue'
442443
- 'inet_lhash2_for_each_icsk_rcu'
444+
- 'interval_tree_for_each_double_span'
445+
- 'interval_tree_for_each_span'
443446
- 'intlist__for_each_entry'
444447
- 'intlist__for_each_entry_safe'
448+
- 'iopt_for_each_contig_area'
445449
- 'kcore_copy__for_each_phdr'
446450
- 'key_for_each'
447451
- 'key_for_each_safe'
@@ -535,6 +539,7 @@ ForEachMacros:
535539
- 'perf_hpp_list__for_each_sort_list_safe'
536540
- 'perf_pmu__for_each_hybrid_pmu'
537541
- 'ping_portaddr_for_each_entry'
542+
- 'ping_portaddr_for_each_entry_rcu'
538543
- 'plist_for_each'
539544
- 'plist_for_each_continue'
540545
- 'plist_for_each_entry'

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*.dtb
2121
*.dtbo
2222
*.dtb.S
23+
*.dtbo.S
2324
*.dwo
2425
*.elf
2526
*.gcno
@@ -38,6 +39,7 @@
3839
*.o.*
3940
*.patch
4041
*.rmeta
42+
*.rpm
4143
*.rsi
4244
*.s
4345
*.so

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ Juha Yrjola <at solidboot.com>
228228
Juha Yrjola <[email protected]>
229229
Juha Yrjola <[email protected]>
230230
231+
231232
232233
233234
Kay Sievers <[email protected]>
@@ -287,6 +288,7 @@ Matthew Wilcox <[email protected]> <[email protected]>
287288
288289
289290
Matthieu CASTET <[email protected]>
291+
290292
291293
Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
292294
@@ -372,6 +374,8 @@ Ricardo Ribalda <[email protected]> <[email protected]>
372374
373375
374376
377+
378+
375379
376380
Rudolf Marek <[email protected]>
377381
Rui Saraiva <[email protected]>

CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,10 @@ N: Justin Guyett
14391439
14401440
D: via-rhine net driver hacking
14411441

1442+
N: Nitin Gupta
1443+
1444+
D: zsmalloc memory allocator and zram block device driver
1445+
14421446
N: Danny ter Haar
14431447
14441448
D: /proc/cpuinfo, reboot on panic , kernel pre-patch tester ;)

Documentation/ABI/stable/sysfs-driver-dma-idxd

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Date: Oct 25, 2019
2222
KernelVersion: 5.6.0
2323
2424
Description: The largest number of work descriptors in a batch.
25+
It's not visible when the device does not support batch.
2526

2627
What: /sys/bus/dsa/devices/dsa<m>/max_work_queues_size
2728
Date: Oct 25, 2019
@@ -49,6 +50,8 @@ Description: The total number of read buffers supported by this device.
4950
The read buffers represent resources within the DSA
5051
implementation, and these resources are allocated by engines to
5152
support operations. See DSA spec v1.2 9.2.4 Total Read Buffers.
53+
It's not visible when the device does not support Read Buffer
54+
allocation control.
5255

5356
What: /sys/bus/dsa/devices/dsa<m>/max_transfer_size
5457
Date: Oct 25, 2019
@@ -122,6 +125,8 @@ Contact: [email protected]
122125
Description: The maximum number of read buffers that may be in use at
123126
one time by operations that access low bandwidth memory in the
124127
device. See DSA spec v1.2 9.2.8 GENCFG on Global Read Buffer Limit.
128+
It's not visible when the device does not support Read Buffer
129+
allocation control.
125130

126131
What: /sys/bus/dsa/devices/dsa<m>/cmd_status
127132
Date: Aug 28, 2020
@@ -205,6 +210,7 @@ KernelVersion: 5.10.0
205210
206211
Description: The max batch size for this workqueue. Cannot exceed device
207212
max batch size. Configurable parameter.
213+
It's not visible when the device does not support batch.
208214

209215
What: /sys/bus/dsa/devices/wq<m>.<n>/ats_disable
210216
Date: Nov 13, 2020
@@ -250,6 +256,8 @@ KernelVersion: 5.17.0
250256
251257
Description: Enable the use of global read buffer limit for the group. See DSA
252258
spec v1.2 9.2.18 GRPCFG Use Global Read Buffer Limit.
259+
It's not visible when the device does not support Read Buffer
260+
allocation control.
253261

254262
What: /sys/bus/dsa/devices/group<m>.<n>/read_buffers_allowed
255263
Date: Dec 10, 2021
@@ -258,6 +266,8 @@ Contact: [email protected]
258266
Description: Indicates max number of read buffers that may be in use at one time
259267
by all engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read
260268
Buffers Allowed.
269+
It's not visible when the device does not support Read Buffer
270+
allocation control.
261271

262272
What: /sys/bus/dsa/devices/group<m>.<n>/read_buffers_reserved
263273
Date: Dec 10, 2021
@@ -266,6 +276,8 @@ Contact: [email protected]
266276
Description: Indicates the number of Read Buffers reserved for the use of
267277
engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read Buffers
268278
Reserved.
279+
It's not visible when the device does not support Read Buffer
280+
allocation control.
269281

270282
What: /sys/bus/dsa/devices/group<m>.<n>/desc_progress_limit
271283
Date: Sept 14, 2022

Documentation/ABI/stable/sysfs-driver-speakup

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ Description: This controls cursor delay when using arrow keys. When a
3535
characters. Set this to a higher value to adjust for the delay
3636
and better synchronisation between cursor position and speech.
3737

38+
What: /sys/accessibility/speakup/cur_phonetic
39+
KernelVersion: 6.2
40+
41+
Description: This allows speakup to speak letters phoneticaly when arrowing through
42+
a word letter by letter. This doesn't affect the spelling when typing
43+
the characters. When cur_phonetic=1, speakup will speak characters
44+
phoneticaly when arrowing over a letter. When cur_phonetic=0, speakup
45+
will speak letters as normally.
46+
3847
What: /sys/accessibility/speakup/delimiters
3948
KernelVersion: 2.6
4049

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Description: Specific MJPEG format descriptors
197197
read-only
198198
bmaControls this format's data for bmaControls in
199199
the streaming header
200-
bmInterfaceFlags specifies interlace information,
200+
bmInterlaceFlags specifies interlace information,
201201
read-only
202202
bAspectRatioY the X dimension of the picture aspect
203203
ratio, read-only
@@ -253,7 +253,7 @@ Description: Specific uncompressed format descriptors
253253
read-only
254254
bmaControls this format's data for bmaControls in
255255
the streaming header
256-
bmInterfaceFlags specifies interlace information,
256+
bmInterlaceFlags specifies interlace information,
257257
read-only
258258
bAspectRatioY the X dimension of the picture aspect
259259
ratio, read-only
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/fan_sensor_information
2+
Date: September 2022
3+
KernelVersion: 6.1
4+
Contact: Armin Wolf <[email protected]>
5+
Description:
6+
This file contains the contents of the fan sensor information buffer,
7+
which contains fan sensor entries and a terminating character (0xFF).
8+
9+
Each fan sensor entry consists of three bytes with an unknown meaning,
10+
interested people may use this file for reverse-engineering.
11+
12+
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/thermal_sensor_information
13+
Date: September 2022
14+
KernelVersion: 6.1
15+
Contact: Armin Wolf <[email protected]>
16+
Description:
17+
This file contains the contents of the thermal sensor information buffer,
18+
which contains thermal sensor entries and a terminating character (0xFF).
19+
20+
Each thermal sensor entry consists of five bytes with an unknown meaning,
21+
interested people may use this file for reverse-engineering.

Documentation/ABI/testing/debugfs-driver-habanalabs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,13 @@ Description: Enables the root user to set the device to specific state.
9191
Valid values are "disable", "enable", "suspend", "resume".
9292
User can read this property to see the valid values
9393

94+
What: /sys/kernel/debug/habanalabs/hl<n>/device_release_watchdog_timeout
95+
Date: Oct 2022
96+
KernelVersion: 6.2
97+
98+
Description: The watchdog timeout value in seconds for a device relese upon
99+
certain error cases, after which the device is reset.
100+
94101
What: /sys/kernel/debug/habanalabs/hl<n>/dma_size
95102
Date: Apr 2021
96103
KernelVersion: 5.13

Documentation/ABI/testing/debugfs-pktcdvd

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)