Skip to content

Commit a1ff5a7

Browse files
committed
Merge drm/drm-fixes into drm-misc-fixes
Let's start the new drm-misc-fixes cycle by bringing in 6.11-rc1. Signed-off-by: Maxime Ripard <[email protected]>
2 parents b5fbf92 + 8400291 commit a1ff5a7

File tree

12,477 files changed

+917482
-209937
lines changed

Some content is hidden

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

12,477 files changed

+917482
-209937
lines changed

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# For more information, see:
66
#
7-
# Documentation/process/clang-format.rst
7+
# Documentation/dev-tools/clang-format.rst
88
# https://clang.llvm.org/docs/ClangFormat.html
99
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
1010
#

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ modules.order
9292
#
9393
/tar-install/
9494

95+
#
96+
# pacman files (make pacman-pkg)
97+
#
98+
/PKGBUILD
99+
/pacman/
100+
95101
#
96102
# We don't want to ignore the following even if they are dot-files
97103
#

.mailmap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ Jaegeuk Kim <[email protected]> <[email protected]>
260260
261261
James Bottomley <jejb@mulgrave.(none)>
262262
James Bottomley <[email protected]>
263+
263264
James E Wilson <[email protected]>
264265
265266
@@ -384,7 +385,9 @@ Li Yang <[email protected]> <[email protected]>
384385
385386
386387
388+
387389
390+
388391
389392
390393
@@ -472,6 +475,8 @@ Nadia Yvette Chambers <[email protected]> William Lee Irwin III <wli@holomorphy
472475
473476
474477
478+
479+
475480
476481
477482
@@ -689,6 +694,7 @@ Vivien Didelot <[email protected]> <[email protected]>
689694
690695
691696
697+
692698
693699
694700

CREDITS

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,13 @@ S: Kopmansg 2
531531
S: 411 13 Goteborg
532532
S: Sweden
533533

534+
N: Daniel Bristot de Oliveira
535+
D: Scheduler contributions, notably: SCHED_DEADLINE
536+
D: Real-time Linux Analysis
537+
D: Runtime Verification
538+
D: OS Noise and Latency Tracers
539+
S: Brazil and Italy
540+
534541
N: Paul Bristow
535542
536543
W: https://paulbristow.net/linux/idefloppy.html
@@ -796,6 +803,11 @@ E: [email protected]
796803
D: Ralink rt2x00 WLAN driver
797804
S: Belas, Portugal
798805

806+
N: Benoît Cousson
807+
808+
D: TI OMAP Devicetree platforms
809+
D: TI OMAP HWMOD boards
810+
799811
N: Alan Cox
800812
W: http://www.linux.org.uk/diary/
801813
D: Linux Networking (0.99.10->2.0.29)
@@ -4368,6 +4380,10 @@ N: Haojian Zhuang
43684380
43694381
D: MMP support
43704382

4383+
N: Tsahee Zidenberg
4384+
4385+
D: Annapurna Labs Alpine Architecture
4386+
43714387
N: Richard Zidlicky
43724388
43734389
W: http://www.geocities.com/rdzidlic

Documentation/ABI/stable/sysfs-block

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,59 @@ Description:
2121
device is offset from the internal allocation unit's
2222
natural alignment.
2323

24+
What: /sys/block/<disk>/atomic_write_max_bytes
25+
Date: February 2024
26+
Contact: Himanshu Madhani <[email protected]>
27+
Description:
28+
[RO] This parameter specifies the maximum atomic write
29+
size reported by the device. This parameter is relevant
30+
for merging of writes, where a merged atomic write
31+
operation must not exceed this number of bytes.
32+
This parameter may be greater than the value in
33+
atomic_write_unit_max_bytes as
34+
atomic_write_unit_max_bytes will be rounded down to a
35+
power-of-two and atomic_write_unit_max_bytes may also be
36+
limited by some other queue limits, such as max_segments.
37+
This parameter - along with atomic_write_unit_min_bytes
38+
and atomic_write_unit_max_bytes - will not be larger than
39+
max_hw_sectors_kb, but may be larger than max_sectors_kb.
40+
41+
42+
What: /sys/block/<disk>/atomic_write_unit_min_bytes
43+
Date: February 2024
44+
Contact: Himanshu Madhani <[email protected]>
45+
Description:
46+
[RO] This parameter specifies the smallest block which can
47+
be written atomically with an atomic write operation. All
48+
atomic write operations must begin at a
49+
atomic_write_unit_min boundary and must be multiples of
50+
atomic_write_unit_min. This value must be a power-of-two.
51+
52+
53+
What: /sys/block/<disk>/atomic_write_unit_max_bytes
54+
Date: February 2024
55+
Contact: Himanshu Madhani <[email protected]>
56+
Description:
57+
[RO] This parameter defines the largest block which can be
58+
written atomically with an atomic write operation. This
59+
value must be a multiple of atomic_write_unit_min and must
60+
be a power-of-two. This value will not be larger than
61+
atomic_write_max_bytes.
62+
63+
64+
What: /sys/block/<disk>/atomic_write_boundary_bytes
65+
Date: February 2024
66+
Contact: Himanshu Madhani <[email protected]>
67+
Description:
68+
[RO] A device may need to internally split an atomic write I/O
69+
which straddles a given logical block address boundary. This
70+
parameter specifies the size in bytes of the atomic boundary if
71+
one is reported by the device. This value must be a
72+
power-of-two and at least the size as in
73+
atomic_write_unit_max_bytes.
74+
Any attempt to merge atomic write I/Os must not result in a
75+
merged I/O which crosses this boundary (if any).
76+
2477

2578
What: /sys/block/<disk>/diskseq
2679
Date: February 2021

Documentation/ABI/stable/sysfs-bus-nvmem

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
1+
What: /sys/bus/nvmem/devices/.../force_ro
2+
Date: June 2024
3+
KernelVersion: 6.11
4+
Contact: Marek Vasut <[email protected]>
5+
Description:
6+
This read/write attribute allows users to set read-write
7+
devices as read-only and back to read-write from userspace.
8+
This can be used to unlock and relock write-protection of
9+
devices which are generally locked, except during sporadic
10+
programming operation.
11+
Read returns '0' or '1' for read-write or read-only modes
12+
respectively.
13+
Write parses one of 'YyTt1NnFf0', or [oO][NnFf] for "on"
14+
and "off", i.e. what kstrbool() supports.
15+
Note: This file is only present if CONFIG_NVMEM_SYSFS
16+
is enabled.
17+
118
What: /sys/bus/nvmem/devices/.../nvmem
219
Date: July 2015
3-
KernelVersion: 4.2
20+
KernelVersion: 4.2
421
Contact: Srinivas Kandagatla <[email protected]>
522
Description:
623
This file allows user to read/write the raw NVMEM contents.
@@ -20,3 +37,14 @@ Description:
2037
...
2138
*
2239
0001000
40+
41+
What: /sys/bus/nvmem/devices/.../type
42+
Date: November 2018
43+
KernelVersion: 5.0
44+
Contact: Alexandre Belloni <[email protected]>
45+
Description:
46+
This read-only attribute allows user to read the NVMEM
47+
device type. Supported types are "Unknown", "EEPROM",
48+
"OTP", "Battery backed", "FRAM".
49+
Note: This file is only present if CONFIG_NVMEM_SYSFS
50+
is enabled.

Documentation/ABI/stable/sysfs-class-backlight

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ Date: April 2005
33
KernelVersion: 2.6.12
44
Contact: Richard Purdie <[email protected]>
55
Description:
6-
Control BACKLIGHT power, values are FB_BLANK_* from fb.h
6+
Control BACKLIGHT power, values are compatible with
7+
FB_BLANK_* from fb.h
78

8-
- FB_BLANK_UNBLANK (0) : power on.
9-
- FB_BLANK_POWERDOWN (4) : power off
9+
- 0 (FB_BLANK_UNBLANK) : power on.
10+
- 4 (FB_BLANK_POWERDOWN) : power off
1011
Users: HAL
1112

1213
What: /sys/class/backlight/<backlight>/brightness
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/0000:XX:XX.X/version
2+
Date: June 2024
3+
KernelVersion: 6.11
4+
Contact: Gerhard Engleder <[email protected]>
5+
Description: Version of the FPGA configuration bitstream as printable string.
6+
This file is read only.
7+
Users: KEBA
8+
9+
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/0000:XX:XX.X/keep_cfg
10+
Date: June 2024
11+
KernelVersion: 6.11
12+
Contact: Gerhard Engleder <[email protected]>
13+
Description: Flag which signals if FPGA shall keep or reload configuration
14+
bitstream on reset. Normal FPGA behavior and default is to keep
15+
configuration bitstream and to only reset the configured logic.
16+
17+
Reloading configuration on reset enables an update of the
18+
configuration bitstream with a simple reboot. Otherwise it is
19+
necessary to power cycle the device to reload the new
20+
configuration bitstream.
21+
22+
This file is read/write. The values are as follows:
23+
1 = keep configuration bitstream on reset, default
24+
0 = reload configuration bitstream on reset
25+
Users: KEBA

Documentation/ABI/testing/configfs-tsm

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,18 @@ Description:
3131
Standardization v2.03 Section 4.1.8.1 MSG_REPORT_REQ.
3232
https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/specifications/56421.pdf
3333

34+
What: /sys/kernel/config/tsm/report/$name/manifestblob
35+
Date: January, 2024
36+
KernelVersion: v6.10
37+
38+
Description:
39+
(RO) Optional supplemental data that a TSM may emit, visibility
40+
of this attribute depends on TSM, and may be empty if no
41+
manifest data is available.
42+
43+
See 'service_provider' for information on the format of the
44+
manifest blob.
45+
3446
What: /sys/kernel/config/tsm/report/$name/provider
3547
Date: September, 2023
3648
KernelVersion: v6.7
@@ -80,3 +92,54 @@ Contact: [email protected]
8092
Description:
8193
(RO) Indicates the minimum permissible value that can be written
8294
to @privlevel.
95+
96+
What: /sys/kernel/config/tsm/report/$name/service_provider
97+
Date: January, 2024
98+
KernelVersion: v6.10
99+
100+
Description:
101+
(WO) Attribute is visible if a TSM implementation provider
102+
supports the concept of attestation reports from a service
103+
provider for TVMs, like SEV-SNP running under an SVSM.
104+
Specifying the service provider via this attribute will create
105+
an attestation report as specified by the service provider.
106+
The only currently supported service provider is "svsm".
107+
108+
For the "svsm" service provider, see the Secure VM Service Module
109+
for SEV-SNP Guests v1.00 Section 7. For the doc, search for
110+
"site:amd.com "Secure VM Service Module for SEV-SNP
111+
Guests", docID: 58019"
112+
113+
What: /sys/kernel/config/tsm/report/$name/service_guid
114+
Date: January, 2024
115+
KernelVersion: v6.10
116+
117+
Description:
118+
(WO) Attribute is visible if a TSM implementation provider
119+
supports the concept of attestation reports from a service
120+
provider for TVMs, like SEV-SNP running under an SVSM.
121+
Specifying an empty/null GUID (00000000-0000-0000-0000-000000)
122+
requests all active services within the service provider be
123+
part of the attestation report. Specifying a GUID request
124+
an attestation report of just the specified service using the
125+
manifest form specified by the service_manifest_version
126+
attribute.
127+
128+
See 'service_provider' for information on the format of the
129+
service guid.
130+
131+
What: /sys/kernel/config/tsm/report/$name/service_manifest_version
132+
Date: January, 2024
133+
KernelVersion: v6.10
134+
135+
Description:
136+
(WO) Attribute is visible if a TSM implementation provider
137+
supports the concept of attestation reports from a service
138+
provider for TVMs, like SEV-SNP running under an SVSM.
139+
Indicates the service manifest version requested for the
140+
attestation report (default 0). If this field is not set by
141+
the user, the default manifest version of the service (the
142+
service's initial/first manifest version) is returned.
143+
144+
See 'service_provider' for information on the format of the
145+
service manifest version.

Documentation/ABI/testing/debugfs-cxl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ Description:
1414
event to its internal Informational Event log, updates the
1515
Event Status register, and if configured, interrupts the host.
1616
It is not an error to inject poison into an address that
17-
already has poison present and no error is returned. The
18-
inject_poison attribute is only visible for devices supporting
19-
the capability.
17+
already has poison present and no error is returned. If the
18+
device returns 'Inject Poison Limit Reached' an -EBUSY error
19+
is returned to the user. The inject_poison attribute is only
20+
visible for devices supporting the capability.
2021

2122

2223
What: /sys/kernel/debug/memX/clear_poison

0 commit comments

Comments
 (0)