Skip to content

Commit 9f77173

Browse files
Merge drm/drm-next into drm-intel-gt-next
Need to pull in b3e4aae ("drm/i915/hdcp: Modify hdcp_gsc_message msg sending mechanism") as a dependency for https://patchwork.freedesktop.org/series/121735/ Signed-off-by: Joonas Lahtinen <[email protected]>
2 parents 28e6711 + d9aa1da commit 9f77173

File tree

15,371 files changed

+553979
-180586
lines changed

Some content is hidden

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

15,371 files changed

+553979
-180586
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ ForEachMacros:
254254
- 'for_each_free_mem_range'
255255
- 'for_each_free_mem_range_reverse'
256256
- 'for_each_func_rsrc'
257+
- 'for_each_group_device'
257258
- 'for_each_group_evsel'
258259
- 'for_each_group_member'
259260
- 'for_each_hstate'

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*.[ch] diff=cpp
33
*.dts diff=dts
44
*.dts[io] diff=dts
5+
*.rs diff=rust

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*.bin
1717
*.bz2
1818
*.c.[012]*.*
19-
*.cover
2019
*.dt.yaml
2120
*.dtb
2221
*.dtbo
@@ -34,7 +33,6 @@
3433
*.lz4
3534
*.lzma
3635
*.lzo
37-
*.mbx
3836
*.mod
3937
*.mod.c
4038
*.o
@@ -51,7 +49,6 @@
5149
*.symversions
5250
*.tab.[ch]
5351
*.tar
54-
*.usyms
5552
*.xz
5653
*.zst
5754
Module.symvers
@@ -112,7 +109,6 @@ modules.order
112109
#
113110
/include/config/
114111
/include/generated/
115-
/include/ksym/
116112
/arch/*/include/generated/
117113

118114
# stgit generated dirs

.mailmap

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
# same person appearing not to be so or badly displayed. Also allows for
66
# old email addresses to map to new email addresses.
77
#
8-
# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
8+
# For format details, see "man gitmailmap" or "MAPPING AUTHORS" in
9+
# "man git-shortlog" on older systems.
910
#
1011
# Please keep this list dictionary sorted.
1112
#
@@ -70,6 +71,8 @@ Baolin Wang <[email protected]> <[email protected]>
7071
7172
7273
74+
75+
7376
Ben Gardner <[email protected]>
7477
Ben M Cahill <[email protected]>
7578
@@ -175,12 +178,17 @@ Gustavo Padovan <[email protected]>
175178
176179
177180
181+
182+
183+
178184
Henk Vergonet <[email protected]>
179185
Henrik Kretzschmar <[email protected]>
180186
Henrik Rydberg <[email protected]>
181187
Herbert Xu <[email protected]>
182188
183189
190+
191+
184192
Jacob Shin <[email protected]>
185193
186194
@@ -233,10 +241,12 @@ Jisheng Zhang <[email protected]> <[email protected]>
233241
234242
235243
244+
236245
John Paul Adrian Glaubitz <[email protected]>
237246
John Stultz <[email protected]>
238247
239248
249+
240250
241251
242252
@@ -270,6 +280,10 @@ Krzysztof Kozlowski <[email protected]> <[email protected]>
270280
Krzysztof Kozlowski <[email protected]> <[email protected]>
271281
Kuninori Morimoto <[email protected]>
272282
283+
284+
285+
286+
273287
Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
274288
275289
Leonard Göhrs <[email protected]>
@@ -296,6 +310,7 @@ Marek Behún <[email protected]> <[email protected]>
296310
Marek Behún <[email protected]> Marek Behun <[email protected]>
297311
Mark Brown <[email protected]>
298312
313+
Markus Schneider-Pargmann <[email protected]> <[email protected]>
299314
300315
301316
@@ -327,6 +342,7 @@ Mauro Carvalho Chehab <[email protected]> <[email protected]>
327342
Mauro Carvalho Chehab <[email protected]> <[email protected]>
328343
Maxim Mikityanskiy <[email protected]> <[email protected]>
329344
Maxim Mikityanskiy <[email protected]> <[email protected]>
345+
330346
331347
332348
Mayuresh Janorkar <[email protected]>
@@ -364,6 +380,11 @@ Nicolas Pitre <[email protected]> <[email protected]>
364380
Nicolas Saenz Julienne <[email protected]> <[email protected]>
365381
Nicolas Saenz Julienne <[email protected]> <[email protected]>
366382
Niklas Söderlund <[email protected]>
383+
Nikolay Aleksandrov <[email protected]> <[email protected]>
384+
Nikolay Aleksandrov <[email protected]> <[email protected]>
385+
Nikolay Aleksandrov <[email protected]> <[email protected]>
386+
Nikolay Aleksandrov <[email protected]> <[email protected]>
387+
Nikolay Aleksandrov <[email protected]> <[email protected]>
367388
Oleksandr Natalenko <[email protected]> <[email protected]>
368389
369390

CREDITS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,12 @@ E: [email protected]
383383
W: http://tomas.nocrew.org/
384384
D: dsp56k device driver
385385

386+
N: Srivatsa S. Bhat
387+
388+
D: Maintainer of Generic Paravirt-Ops subsystem
389+
D: Maintainer of VMware hypervisor interface
390+
D: Maintainer of VMware virtual PTP clock driver (ptp_vmw)
391+
386392
N: Ross Biro
387393
388394
D: Original author of the Linux networking code
@@ -1706,6 +1712,10 @@ S: Panoramastrasse 18
17061712
S: D-69126 Heidelberg
17071713
S: Germany
17081714

1715+
N: Neil Horman
1716+
1717+
D: SCTP protocol maintainer.
1718+
17091719
N: Simon Horman
17101720
17111721
D: Renesas ARM/ARM64 SoC maintainer

Documentation/ABI/obsolete/o2cb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
What: /sys/o2cb
22
Date: Dec 2005
33
KernelVersion: 2.6.16
4-
Contact: ocfs2-devel@oss.oracle.com
4+
Contact: ocfs2-devel@lists.linux.dev
55
Description: Ocfs2-tools looks at 'interface-revision' for versioning
66
information. Each logmask/ file controls a set of debug prints
77
and can be written into with the strings "allow", "deny", or
88
"off". Reading the file returns the current state.
99
Was renamed to /sys/fs/u2cb/
1010
Users: ocfs2-tools. It's sufficient to mail proposed changes to
11-
ocfs2-devel@oss.oracle.com.
11+
ocfs2-devel@lists.linux.dev.

Documentation/ABI/removed/o2cb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
What: /sys/o2cb symlink
22
Date: May 2011
33
KernelVersion: 3.0
4-
Contact: ocfs2-devel@oss.oracle.com
4+
Contact: ocfs2-devel@lists.linux.dev
55
Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is
66
removed when new versions of ocfs2-tools which know to look
77
in /sys/fs/o2cb are sufficiently prevalent. Don't code new
88
software to look here, it should try /sys/fs/o2cb instead.
99
Users: ocfs2-tools. It's sufficient to mail proposed changes to
10-
ocfs2-devel@oss.oracle.com.
10+
ocfs2-devel@lists.linux.dev.

Documentation/ABI/stable/o2cb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
What: /sys/fs/o2cb/
22
Date: Dec 2005
33
KernelVersion: 2.6.16
4-
Contact: ocfs2-devel@oss.oracle.com
4+
Contact: ocfs2-devel@lists.linux.dev
55
Description: Ocfs2-tools looks at 'interface-revision' for versioning
66
information. Each logmask/ file controls a set of debug prints
77
and can be written into with the strings "allow", "deny", or
88
"off". Reading the file returns the current state.
99
Users: ocfs2-tools. It's sufficient to mail proposed changes to
10-
ocfs2-devel@oss.oracle.com.
10+
ocfs2-devel@lists.linux.dev.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
What: /sys/bus/wmi/devices/05901221-D566-11D1-B2F0-00A0C9062910[-X]/bmof
2+
Date: Jun 2017
3+
KernelVersion: 4.13
4+
Description:
5+
Binary MOF metadata used to decribe the details of available ACPI WMI interfaces.
6+
7+
See Documentation/wmi/devices/wmi-bmof.rst for details.

Documentation/ABI/testing/debugfs-dell-wmi-ddv

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,32 @@ Date: September 2022
33
KernelVersion: 6.1
44
Contact: Armin Wolf <[email protected]>
55
Description:
6-
This file contains the contents of the fan sensor information buffer,
7-
which contains fan sensor entries and a terminating character (0xFF).
6+
This file contains the contents of the fan sensor information
7+
buffer, which contains fan sensor entries and a terminating
8+
character (0xFF).
89

9-
Each fan sensor entry consists of three bytes with an unknown meaning,
10-
interested people may use this file for reverse-engineering.
10+
Each fan sensor entry contains:
11+
12+
- fan type (single byte)
13+
- fan speed in RPM (two bytes, little endian)
14+
15+
See Documentation/wmi/devices/dell-wmi-ddv.rst for details.
1116

1217
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/thermal_sensor_information
1318
Date: September 2022
1419
KernelVersion: 6.1
1520
Contact: Armin Wolf <[email protected]>
1621
Description:
17-
This file contains the contents of the thermal sensor information buffer,
18-
which contains thermal sensor entries and a terminating character (0xFF).
22+
This file contains the contents of the thermal sensor information
23+
buffer, which contains thermal sensor entries and a terminating
24+
character (0xFF).
25+
26+
Each thermal sensor entry contains:
27+
28+
- thermal type (single byte)
29+
- current temperature (single byte)
30+
- min. temperature (single byte)
31+
- max. temperature (single byte)
32+
- unknown field (single byte)
1933

20-
Each thermal sensor entry consists of five bytes with an unknown meaning,
21-
interested people may use this file for reverse-engineering.
34+
See Documentation/wmi/devices/dell-wmi-ddv.rst for details.

0 commit comments

Comments
 (0)