Skip to content

Commit db6da59

Browse files
author
Thomas Zimmermann
committed
Merge drm/drm-next into drm-misc-next-fixes
Backmerging to sync drm-misc-next-fixes with drm-misc-next. Signed-off-by: Thomas Zimmermann <[email protected]>
2 parents cf03e29 + 901bdf5 commit db6da59

File tree

13,232 files changed

+713286
-408115
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,232 files changed

+713286
-408115
lines changed

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ ForEachMacros:
520520
- 'of_property_for_each_string'
521521
- 'of_property_for_each_u32'
522522
- 'pci_bus_for_each_resource'
523-
- 'pci_doe_for_each_off'
523+
- 'pci_dev_for_each_resource'
524524
- 'pcl_for_each_chunk'
525525
- 'pcl_for_each_segment'
526526
- 'pcm_for_each_format'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ modules.order
103103
!.get_maintainer.ignore
104104
!.gitattributes
105105
!.gitignore
106+
!.kunitconfig
106107
!.mailmap
107108
!.rustfmt.toml
108109

.mailmap

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,10 @@ Jeff Garzik <[email protected]>
213213
214214
215215
216-
Jens Axboe <[email protected]>
216+
217+
218+
219+
217220
Jens Osterkamp <[email protected]>
218221
219222
@@ -232,6 +235,8 @@ Johan Hovold <[email protected]> <[email protected]>
232235
233236
John Paul Adrian Glaubitz <[email protected]>
234237
John Stultz <[email protected]>
238+
239+
235240
236241
237242
@@ -265,7 +270,9 @@ Krzysztof Kozlowski <[email protected]> <[email protected]>
265270
Krzysztof Kozlowski <[email protected]> <[email protected]>
266271
Kuninori Morimoto <[email protected]>
267272
273+
Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
268274
275+
Leonard Göhrs <[email protected]>
269276
Leonid I Ananiev <[email protected]>
270277
271278
@@ -295,6 +302,8 @@ Martin Kepplinger <[email protected]> <[email protected]>
295302
296303
Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
297304
Mathieu Othacehe <[email protected]>
305+
306+
298307
299308
300309
@@ -318,10 +327,12 @@ Mauro Carvalho Chehab <[email protected]> <[email protected]>
318327
Mauro Carvalho Chehab <[email protected]> <[email protected]>
319328
Maxim Mikityanskiy <[email protected]> <[email protected]>
320329
Maxim Mikityanskiy <[email protected]> <[email protected]>
330+
321331
322332
323333
Mayuresh Janorkar <[email protected]>
324334
Michael Buesch <[email protected]>
335+
325336
Michel Dänzer <[email protected]>
326337
Michel Lespinasse <[email protected]>
327338
@@ -354,6 +365,7 @@ Nicolas Pitre <[email protected]> <[email protected]>
354365
Nicolas Saenz Julienne <[email protected]> <[email protected]>
355366
Nicolas Saenz Julienne <[email protected]> <[email protected]>
356367
Niklas Söderlund <[email protected]>
368+
Oleksandr Natalenko <[email protected]> <[email protected]>
357369
358370
359371
@@ -369,6 +381,8 @@ Paul E. McKenney <[email protected]> <[email protected]>
369381
370382
371383
384+
385+
372386
Peter A Jonsson <[email protected]>
373387
Peter Oruba <[email protected]>
374388
Peter Oruba <[email protected]>

CREDITS

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@ S: University of Notre Dame
229229
S: Notre Dame, Indiana
230230
S: USA
231231

232+
N: Kai Bankett
233+
234+
D: QNX6 filesystem
235+
232236
N: Greg Banks
233237
234238
D: IDT77105 ATM network driver
@@ -886,6 +890,10 @@ W: http://jdelvare.nerim.net/
886890
D: Several hardware monitoring drivers
887891
S: France
888892

893+
N: Frank "Jedi/Sector One" Denis
894+
895+
D: QNX4 filesystem
896+
889897
N: Peter Denison
890898
891899
W: http://www.pnd-pc.demon.co.uk/promise/
@@ -1259,6 +1267,10 @@ S: USA
12591267
N: Adam Fritzler
12601268
12611269

1270+
N: Richard "Scuba" A. Frowijn
1271+
1272+
D: QNX4 filesystem
1273+
12621274
N: Fernando Fuganti
12631275
12641276
@@ -2218,6 +2230,10 @@ D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA
22182230
D: NUMA support, Slab allocators, Page migration
22192231
D: Scalability, Time subsystem
22202232

2233+
N: Anders Larsen
2234+
2235+
D: QNX4 filesystem
2236+
22212237
N: Paul Laufer
22222238
22232239
D: Soundblaster driver fixes, ISAPnP quirk
@@ -2494,8 +2510,8 @@ D: XF86_8514
24942510
D: cfdisk (curses based disk partitioning program)
24952511

24962512
N: Mat Martineau
2497-
E: mat@martineau.name
2498-
D: MPTCP subsystem co-maintainer 2020-2023
2513+
E: martineau@kernel.org
2514+
D: MPTCP subsystem co-maintainer
24992515
D: Keyctl restricted keyring and Diffie-Hellman UAPI
25002516
D: Bluetooth L2CAP ERTM mode and AMP
25012517
S: USA
@@ -3459,6 +3475,11 @@ D: several improvements to system programs
34593475
S: Oldenburg
34603476
S: Germany
34613477

3478+
N: Mathieu Poirier
3479+
3480+
D: CoreSight kernel subsystem, Maintainer 2014-2022
3481+
D: Perf tool support for CoreSight
3482+
34623483
N: Robert Schwebel
34633484
34643485
W: https://www.schwebel.de

Documentation/ABI/obsolete/sysfs-selinux-checkreqprot renamed to Documentation/ABI/removed/sysfs-selinux-checkreqprot

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ KernelVersion: 2.6.12-rc2 (predates git)
44
55
Description:
66

7+
REMOVAL UPDATE: The SELinux checkreqprot functionality was removed in
8+
March 2023, the original deprecation notice is shown below.
9+
710
The selinuxfs "checkreqprot" node allows SELinux to be configured
811
to check the protection requested by userspace for mmap/mprotect
912
calls instead of the actual protection applied by the kernel.

Documentation/ABI/obsolete/sysfs-selinux-disable renamed to Documentation/ABI/removed/sysfs-selinux-disable

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ KernelVersion: 2.6.12-rc2 (predates git)
44
55
Description:
66

7+
REMOVAL UPDATE: The SELinux runtime disable functionality was removed
8+
in March 2023, the original deprecation notice is shown below.
9+
710
The selinuxfs "disable" node allows SELinux to be disabled at runtime
811
prior to a policy being loaded into the kernel. If disabled via this
912
mechanism, SELinux will remain disabled until the system is rebooted.

Documentation/ABI/stable/sysfs-acpi-pmprofile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ What: /sys/firmware/acpi/pm_profile
22
Date: 03-Nov-2011
33
KernelVersion: v3.2
44
5-
Description: The ACPI pm_profile sysfs interface exports the platform
6-
power management (and performance) requirement expectations
7-
as provided by BIOS. The integer value is directly passed as
8-
retrieved from the FADT ACPI table.
5+
Description: The ACPI pm_profile sysfs interface exposes the preferred
6+
power management (and performance) profile of the platform
7+
as provided in the ACPI FADT Preferred_PM_Profile field.
98

10-
Values: For possible values see ACPI specification:
11-
5.2.9 Fixed ACPI Description Table (FADT)
12-
Field: Preferred_PM_Profile
9+
The integer value is directly passed as retrieved from the FADT.
1310

14-
Currently these values are defined by spec:
11+
Values: For the possible values refer to the Preferred_PM_Profile field
12+
definition in Table 5.9 "FADT Format", Section 5.2.9 "Fixed ACPI
13+
Description Table (FADT)" of the ACPI specification.
14+
15+
As of ACPI 6.5, the following values are defined:
1516

1617
== =================
1718
0 Unspecified
@@ -22,5 +23,6 @@ Values: For possible values see ACPI specification:
2223
5 SOHO Server
2324
6 Appliance PC
2425
7 Performance Server
25-
>7 Reserved
26+
8 Tablet
27+
>8 Reserved
2628
== =================

Documentation/ABI/stable/sysfs-block

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -336,18 +336,11 @@ What: /sys/block/<disk>/queue/io_poll_delay
336336
Date: November 2016
337337
338338
Description:
339-
[RW] If polling is enabled, this controls what kind of polling
340-
will be performed. It defaults to -1, which is classic polling.
339+
[RW] This was used to control what kind of polling will be
340+
performed. It is now fixed to -1, which is classic polling.
341341
In this mode, the CPU will repeatedly ask for completions
342-
without giving up any time. If set to 0, a hybrid polling mode
343-
is used, where the kernel will attempt to make an educated guess
344-
at when the IO will complete. Based on this guess, the kernel
345-
will put the process issuing IO to sleep for an amount of time,
346-
before entering a classic poll loop. This mode might be a little
347-
slower than pure classic polling, but it will be more efficient.
348-
If set to a value larger than 0, the kernel will put the process
349-
issuing IO to sleep for this amount of microseconds before
350-
entering classic polling.
342+
without giving up any time.
343+
<deprecated>
351344

352345

353346
What: /sys/block/<disk>/queue/io_timeout

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,22 @@ Description: The last executed device administrative command's status/error.
136136
Also last configuration error overloaded.
137137
Writing to it will clear the status.
138138

139+
What: /sys/bus/dsa/devices/dsa<m>/iaa_cap
140+
Date: Sept 14, 2022
141+
KernelVersion: 6.0.0
142+
143+
Description: IAA (IAX) capability mask. Exported to user space for application
144+
consumption. This attribute should only be visible on IAA devices
145+
that are version 2 or later.
146+
147+
What: /sys/bus/dsa/devices/dsa<m>/event_log_size
148+
Date: Sept 14, 2022
149+
KernelVersion: 6.4.0
150+
151+
Description: The event log size to be configured. Default is 64 entries and
152+
occupies 4k size if the evl entry is 64 bytes. It's visible
153+
only on platforms that support the capability.
154+
139155
What: /sys/bus/dsa/devices/wq<m>.<n>/block_on_fault
140156
Date: Oct 27, 2020
141157
KernelVersion: 5.11.0
@@ -219,6 +235,16 @@ Contact: [email protected]
219235
Description: Indicate whether ATS disable is turned on for the workqueue.
220236
0 indicates ATS is on, and 1 indicates ATS is off for the workqueue.
221237

238+
What: /sys/bus/dsa/devices/wq<m>.<n>/prs_disable
239+
Date: Sept 14, 2022
240+
KernelVersion: 6.4.0
241+
242+
Description: Controls whether PRS disable is turned on for the workqueue.
243+
0 indicates PRS is on, and 1 indicates PRS is off for the
244+
workqueue. This option overrides block_on_fault attribute
245+
if set. It's visible only on platforms that support the
246+
capability.
247+
222248
What: /sys/bus/dsa/devices/wq<m>.<n>/occupancy
223249
Date May 25, 2021
224250
KernelVersion: 5.14.0
@@ -302,3 +328,28 @@ Description: Allows control of the number of batch descriptors that can be
302328
1 (1/2 of max value), 2 (1/4 of the max value), and 3 (1/8 of
303329
the max value). It's visible only on platforms that support
304330
the capability.
331+
332+
What: /sys/bus/dsa/devices/wq<m>.<n>/dsa<x>\!wq<m>.<n>/file<y>/cr_faults
333+
Date: Sept 14, 2022
334+
KernelVersion: 6.4.0
335+
336+
Description: Show the number of Completion Record (CR) faults this application
337+
has caused.
338+
339+
What: /sys/bus/dsa/devices/wq<m>.<n>/dsa<x>\!wq<m>.<n>/file<y>/cr_fault_failures
340+
Date: Sept 14, 2022
341+
KernelVersion: 6.4.0
342+
343+
Description: Show the number of Completion Record (CR) faults failures that this
344+
application has caused. The failure counter is incremented when the
345+
driver cannot fault in the address for the CR. Typically this is caused
346+
by a bad address programmed in the submitted descriptor or a malicious
347+
submitter is using bad CR address on purpose.
348+
349+
What: /sys/bus/dsa/devices/wq<m>.<n>/dsa<x>\!wq<m>.<n>/file<y>/pid
350+
Date: Sept 14, 2022
351+
KernelVersion: 6.4.0
352+
353+
Description: Show the process id of the application that opened the file. This is
354+
helpful information for a monitor daemon that wants to kill the
355+
application that opened the file.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Date: Dec 2014
7676
KernelVersion: 4.0
7777
Description: Default camera terminal descriptors
7878

79-
All attributes read only:
79+
All attributes read only except bmControls, which is read/write:
8080

8181
======================== ====================================
8282
bmControls bitmap specifying which controls are
@@ -101,7 +101,7 @@ Date: Dec 2014
101101
KernelVersion: 4.0
102102
Description: Default processing unit descriptors
103103

104-
All attributes read only:
104+
All attributes read only except bmControls, which is read/write:
105105

106106
=============== ========================================
107107
iProcessing index of string descriptor

0 commit comments

Comments
 (0)