Skip to content

Commit f600187

Browse files
committed
Merge tag 'v6.13-rc6' into drm-next
This backmerges Linux 6.13-rc6 this is need for the newer pulls. Signed-off-by: Dave Airlie <[email protected]>
2 parents 6ec692d + 9d89551 commit f600187

File tree

502 files changed

+6361
-2750
lines changed

Some content is hidden

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

502 files changed

+6361
-2750
lines changed

.mailmap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ Martin Kepplinger <[email protected]> <[email protected]>
435435
436436
437437
Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
438-
Mathieu Othacehe <m.othacehe@gmail.com> <othacehe@gnu.org>
438+
Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>
439439
440440
441441
@@ -735,6 +735,7 @@ Wolfram Sang <[email protected]> <[email protected]>
735735
736736
737737
738+
738739
Yusuke Goda <[email protected]>
739740
740741

Documentation/admin-guide/laptops/thinkpad-acpi.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,10 @@ event code Key Notes
445445
0x1008 0x07 FN+F8 IBM: toggle screen expand
446446
Lenovo: configure UltraNav,
447447
or toggle screen expand.
448-
On newer platforms (2024+)
449-
replaced by 0x131f (see below)
448+
On 2024 platforms replaced by
449+
0x131f (see below) and on newer
450+
platforms (2025 +) keycode is
451+
replaced by 0x1401 (see below).
450452

451453
0x1009 0x08 FN+F9 -
452454

@@ -506,9 +508,11 @@ event code Key Notes
506508

507509
0x1019 0x18 unknown
508510

509-
0x131f ... FN+F8 Platform Mode change.
511+
0x131f ... FN+F8 Platform Mode change (2024 systems).
510512
Implemented in driver.
511513

514+
0x1401 ... FN+F8 Platform Mode change (2025 + systems).
515+
Implemented in driver.
512516
... ... ...
513517

514518
0x1020 0x1F unknown

Documentation/admin-guide/mm/transhuge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ AnonHugePmdMapped).
436436
The number of file transparent huge pages mapped to userspace is available
437437
by reading ShmemPmdMapped and ShmemHugePages fields in ``/proc/meminfo``.
438438
To identify what applications are mapping file transparent huge pages, it
439-
is necessary to read ``/proc/PID/smaps`` and count the FileHugeMapped fields
439+
is necessary to read ``/proc/PID/smaps`` and count the FilePmdMapped fields
440440
for each mapping.
441441

442442
Note that reading the smaps file is expensive and reading it

Documentation/admin-guide/pm/amd-pstate.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,7 @@ performance supported in `AMD CPPC Performance Capability <perf_cap_>`_).
251251
In some ASICs, the highest CPPC performance is not the one in the ``_CPC``
252252
table, so we need to expose it to sysfs. If boost is not active, but
253253
still supported, this maximum frequency will be larger than the one in
254-
``cpuinfo``. On systems that support preferred core, the driver will have
255-
different values for some cores than others and this will reflect the values
256-
advertised by the platform at bootup.
254+
``cpuinfo``.
257255
This attribute is read-only.
258256

259257
``amd_pstate_lowest_nonlinear_freq``

Documentation/devicetree/bindings/crypto/fsl,sec-v4.0.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ patternProperties:
114114
table that specifies the PPID to LIODN mapping. Needed if the PAMU is
115115
used. Value is a 12 bit value where value is a LIODN ID for this JR.
116116
This property is normally set by boot firmware.
117-
$ref: /schemas/types.yaml#/definitions/uint32
118-
maximum: 0xfff
117+
$ref: /schemas/types.yaml#/definitions/uint32-array
118+
items:
119+
- maximum: 0xfff
119120

120121
'^rtic@[0-9a-f]+$':
121122
type: object
@@ -186,8 +187,9 @@ patternProperties:
186187
Needed if the PAMU is used. Value is a 12 bit value where value
187188
is a LIODN ID for this JR. This property is normally set by boot
188189
firmware.
189-
$ref: /schemas/types.yaml#/definitions/uint32
190-
maximum: 0xfff
190+
$ref: /schemas/types.yaml#/definitions/uint32-array
191+
items:
192+
- maximum: 0xfff
191193

192194
fsl,rtic-region:
193195
description:

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ properties:
9090
adi,dsi-lanes:
9191
description: Number of DSI data lanes connected to the DSI host.
9292
$ref: /schemas/types.yaml#/definitions/uint32
93-
enum: [ 1, 2, 3, 4 ]
93+
enum: [ 2, 3, 4 ]
9494

9595
"#sound-dai-cells":
9696
const: 0

Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ examples:
8282
8383
uimage@100000 {
8484
reg = <0x0100000 0x200000>;
85-
compress = "lzma";
85+
compression = "lzma";
8686
};
8787
};
8888

Documentation/devicetree/bindings/soc/fsl/fsl,qman-portal.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ properties:
3535

3636
fsl,liodn:
3737
$ref: /schemas/types.yaml#/definitions/uint32-array
38+
maxItems: 2
3839
description: See pamu.txt. Two LIODN(s). DQRR LIODN (DLIODN) and Frame LIODN
3940
(FLIODN)
4041

@@ -69,6 +70,7 @@ patternProperties:
6970
type: object
7071
properties:
7172
fsl,liodn:
73+
$ref: /schemas/types.yaml#/definitions/uint32-array
7274
description: See pamu.txt, PAMU property used for static LIODN assignment
7375

7476
fsl,iommu-parent:

Documentation/devicetree/bindings/sound/realtek,rt5645.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ properties:
5151
description: Power supply for AVDD, providing 1.8V.
5252

5353
cpvdd-supply:
54-
description: Power supply for CPVDD, providing 3.5V.
54+
description: Power supply for CPVDD, providing 1.8V.
5555

5656
hp-detect-gpios:
5757
description:

0 commit comments

Comments
 (0)