Skip to content

Commit d4f14fa

Browse files
tdztdz
committed
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get fixes from v6.18-rc6. Signed-off-by: Thomas Zimmermann <[email protected]>
2 parents 949f1fd + 6a23ae0 commit d4f14fa

File tree

698 files changed

+7911
-3111
lines changed

Some content is hidden

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

698 files changed

+7911
-3111
lines changed

‎.mailmap‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ Danilo Krummrich <[email protected]> <[email protected]>
206206
David Brownell <[email protected]>
207207
David Collins <[email protected]> <[email protected]>
208208
David Heidelberg <[email protected]> <[email protected]>
209+
David Hildenbrand <[email protected]> <[email protected]>
209210
David Rheinsberg <[email protected]> <[email protected]>
210211
David Rheinsberg <[email protected]> <[email protected]>
211212
David Rheinsberg <[email protected]> <[email protected]>
@@ -426,7 +427,7 @@ Kenneth W Chen <[email protected]>
426427
Kenneth Westfield <[email protected]> <[email protected]>
427428
Kiran Gunda <[email protected]> <[email protected]>
428429
Kirill Tkhai <[email protected]> <[email protected]>
429-
Kirill A. Shutemov <[email protected]> <[email protected]>
430+
Kiryl Shutsemau <[email protected]> <[email protected]>
430431
Kishon Vijay Abraham I <[email protected]> <[email protected]>
431432
Konrad Dybcio <[email protected]> <[email protected]>
432433
Konrad Dybcio <[email protected]> <[email protected]>
@@ -605,7 +606,8 @@ Oleksij Rempel <[email protected]>
605606
Oleksij Rempel <[email protected]> <[email protected]>
606607
Oliver Hartkopp <[email protected]> <[email protected]>
607608
Oliver Hartkopp <[email protected]> <[email protected]>
608-
Oliver Upton <[email protected]> <[email protected]>
609+
Oliver Upton <[email protected]> <[email protected]>
610+
Oliver Upton <[email protected]> <[email protected]>
609611
Ondřej Jirman <[email protected]> <[email protected]>
610612
Oza Pawandeep <[email protected]> <[email protected]>
611613
Pali Rohár <[email protected]> <[email protected]>
@@ -644,6 +646,7 @@ Qais Yousef <[email protected]> <[email protected]>
644646
Quentin Monnet <[email protected]> <[email protected]>
645647
Quentin Monnet <[email protected]> <[email protected]>
646648
Quentin Perret <[email protected]> <[email protected]>
649+
Rae Moar <[email protected]> <[email protected]>
647650
Rafael J. Wysocki <[email protected]> <[email protected]>
648651
Rajeev Nandan <[email protected]> <[email protected]>
649652
Rajendra Nayak <[email protected]> <[email protected]>

‎CREDITS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,6 +2036,10 @@ S: Botanicka' 68a
20362036
S: 602 00 Brno
20372037
S: Czech Republic
20382038

2039+
N: Karsten Keil
2040+
E: [email protected]
2041+
D: ISDN subsystem maintainer
2042+
20392043
N: Jakob Kemi
20402044
E: [email protected]
20412045
D: V4L W9966 Webcam driver

‎Documentation/devicetree/bindings/gpio/ti,twl4030-gpio.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/ti,twl4030-gpio.yaml#
4+
$id: http://devicetree.org/schemas/gpio/ti,twl4030-gpio.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: TI TWL4030 GPIO controller

‎Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ allOf:
180180
then:
181181
properties:
182182
reg:
183-
minItems: 2
183+
maxItems: 2
184184
reg-names:
185-
minItems: 2
185+
maxItems: 2
186186
else:
187187
properties:
188188
reg:

‎Documentation/devicetree/bindings/sound/qcom,pm4125-sdw.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ properties:
3232
3333
$ref: /schemas/types.yaml#/definitions/uint32-array
3434
minItems: 2
35-
maxItems: 2
35+
maxItems: 4
3636
items:
3737
enum: [1, 2, 3, 4]
3838

@@ -48,7 +48,7 @@ properties:
4848
4949
$ref: /schemas/types.yaml#/definitions/uint32-array
5050
minItems: 2
51-
maxItems: 2
51+
maxItems: 5
5252
items:
5353
enum: [1, 2, 3, 4, 5]
5454

‎Documentation/firmware-guide/acpi/i2c-muxes.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ which corresponds to the following ASL (in the scope of \_SB)::
3737
Name (_HID, ...)
3838
Name (_CRS, ResourceTemplate () {
3939
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
40-
AddressingMode7Bit, "\\_SB.SMB1.CH00", 0x00,
41-
ResourceConsumer,,)
40+
AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH00",
41+
0x00, ResourceConsumer,,)
4242
}
4343
}
4444
}
@@ -52,8 +52,8 @@ which corresponds to the following ASL (in the scope of \_SB)::
5252
Name (_HID, ...)
5353
Name (_CRS, ResourceTemplate () {
5454
I2cSerialBus (0x50, ControllerInitiated, I2C_SPEED,
55-
AddressingMode7Bit, "\\_SB.SMB1.CH01", 0x00,
56-
ResourceConsumer,,)
55+
AddressingMode7Bit, "\\_SB.SMB1.MUX0.CH01",
56+
0x00, ResourceConsumer,,)
5757
}
5858
}
5959
}

‎Documentation/netlink/specs/dpll.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,8 @@ operations:
605605
reply: &pin-attrs
606606
attributes:
607607
- id
608+
- module-name
609+
- clock-id
608610
- board-label
609611
- panel-label
610612
- package-label

‎Documentation/networking/netconsole.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ Userdata append support by Matthew Wood <[email protected]>, Jan 22 2024
1919

2020
Sysdata append support by Breno Leitao <[email protected]>, Jan 15 2025
2121

22-
Please send bug reports to Matt Mackall <[email protected]>
23-
Satyam Sharma <[email protected]>, and Cong Wang <[email protected]>
24-
2522
Introduction:
2623
=============
2724

‎Documentation/sound/codecs/cs35l56.rst‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ In this example the SSID is 10280c63.
105105

106106
The format of the firmware file names is:
107107

108-
SoundWire (except CS35L56 Rev B0):
108+
SoundWire:
109109
cs35lxx-b0-dsp1-misc-SSID[-spkidX]-l?u?
110110

111-
SoundWire CS35L56 Rev B0:
111+
SoundWire CS35L56 Rev B0 firmware released before kernel version 6.16:
112112
cs35lxx-b0-dsp1-misc-SSID[-spkidX]-ampN
113113

114114
Non-SoundWire (HDA and I2S):
@@ -127,9 +127,8 @@ Where:
127127
* spkidX is an optional part, used for laptops that have firmware
128128
configurations for different makes and models of internal speakers.
129129

130-
The CS35L56 Rev B0 continues to use the old filename scheme because a
131-
large number of firmware files have already been published with these
132-
names.
130+
Early firmware for CS35L56 Rev B0 used the ALSA prefix (ampN) as the
131+
filename qualifier. Support for the l?u? qualifier was added in kernel 6.16.
133132

134133
Sound Open Firmware and ALSA topology files
135134
-------------------------------------------

‎Documentation/userspace-api/netlink/intro-specs.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Simple CLI
1313
Kernel comes with a simple CLI tool which should be useful when
1414
developing Netlink related code. The tool is implemented in Python
1515
and can use a YAML specification to issue Netlink requests
16-
to the kernel. Only Generic Netlink is supported.
16+
to the kernel.
1717

1818
The tool is located at ``tools/net/ynl/pyynl/cli.py``. It accepts
19-
a handul of arguments, the most important ones are:
19+
a handful of arguments, the most important ones are:
2020

2121
- ``--spec`` - point to the spec file
2222
- ``--do $name`` / ``--dump $name`` - issue request ``$name``

0 commit comments

Comments
 (0)