Skip to content

Commit 568bfce

Browse files
committed
Merge 6.13-rc7 into tty-next
We need the serial driver fixes in here to build on top of. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents 422c972 + 5bc55a3 commit 568bfce

File tree

830 files changed

+9169
-4683
lines changed

Some content is hidden

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

830 files changed

+9169
-4683
lines changed

.mailmap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ Ben Widawsky <[email protected]> <[email protected]>
121121
122122
Benjamin Tissoires <[email protected]> <[email protected]>
123123
Benjamin Tissoires <[email protected]> <[email protected]>
124+
125+
124126
125127
126128
@@ -435,7 +437,7 @@ Martin Kepplinger <[email protected]> <[email protected]>
435437
436438
437439
Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
438-
Mathieu Othacehe <m.othacehe@gmail.com> <othacehe@gnu.org>
440+
Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>
439441
440442
441443
@@ -735,6 +737,7 @@ Wolfram Sang <[email protected]> <[email protected]>
735737
736738
737739
740+
738741
Yusuke Goda <[email protected]>
739742
740743

CREDITS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ N: Thomas Abraham
2020
2121
D: Samsung pin controller driver
2222

23+
N: Jose Abreu
24+
25+
D: Synopsys DesignWare XPCS MDIO/PCS driver.
26+
2327
N: Dragos Acostachioaie
2428
2529
W: http://www.arbornet.org/~dragos
@@ -1428,6 +1432,10 @@ S: 8124 Constitution Apt. 7
14281432
S: Sterling Heights, Michigan 48313
14291433
S: USA
14301434

1435+
N: Andy Gospodarek
1436+
1437+
D: Maintenance and contributions to the network interface bonding driver.
1438+
14311439
N: Wolfgang Grandegger
14321440
14331441
D: Controller Area Network (device drivers)
@@ -1812,6 +1820,10 @@ D: Author/maintainer of most DRM drivers (especially ATI, MGA)
18121820
D: Core DRM templates, general DRM and 3D-related hacking
18131821
S: No fixed address
18141822

1823+
N: Woojung Huh
1824+
1825+
D: Microchip LAN78XX USB Ethernet driver
1826+
18151827
N: Kenn Humborg
18161828
18171829
D: Mods to loop device to support sparse backing files

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/display/mediatek/mediatek,dp.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ properties:
4242
interrupts:
4343
maxItems: 1
4444

45+
'#sound-dai-cells':
46+
const: 0
47+
4548
ports:
4649
$ref: /schemas/graph.yaml#/properties/ports
4750
properties:
@@ -85,7 +88,21 @@ required:
8588
- ports
8689
- max-linkrate-mhz
8790

88-
additionalProperties: false
91+
allOf:
92+
- $ref: /schemas/sound/dai-common.yaml#
93+
- if:
94+
not:
95+
properties:
96+
compatible:
97+
contains:
98+
enum:
99+
- mediatek,mt8188-dp-tx
100+
- mediatek,mt8195-dp-tx
101+
then:
102+
properties:
103+
'#sound-dai-cells': false
104+
105+
unevaluatedProperties: false
89106

90107
examples:
91108
- |

Documentation/devicetree/bindings/iio/st,st-sensors.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ properties:
6565
- st,lsm9ds0-gyro
6666
- description: STMicroelectronics Magnetometers
6767
enum:
68+
- st,iis2mdc
6869
- st,lis2mdl
6970
- st,lis3mdl-magn
7071
- st,lsm303agr-magn

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

0 commit comments

Comments
 (0)