Skip to content

Commit 2919c4a

Browse files
committed
Merge 6.13-rc7 into usb-next
We need the USB fixes in here as well for testing. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents 594c823 + 5bc55a3 commit 2919c4a

File tree

578 files changed

+5298
-3118
lines changed

Some content is hidden

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

578 files changed

+5298
-3118
lines changed

.mailmap

Lines changed: 3 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

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/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/net/pse-pd/pse-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ properties:
8181
List of phandles, each pointing to the power supply for the
8282
corresponding pairset named in 'pairset-names'. This property
8383
aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4.
84-
PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145\u20133)
84+
PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145-3)
8585
|-----------|---------------|---------------|---------------|---------------|
8686
| Conductor | Alternative A | Alternative A | Alternative B | Alternative B |
8787
| | (MDI-X) | (MDI) | (X) | (S) |

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:

Documentation/netlink/specs/mptcp_pm.yaml

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,65 +22,67 @@ definitions:
2222
doc: unused event
2323
-
2424
name: created
25-
doc:
26-
token, family, saddr4 | saddr6, daddr4 | daddr6, sport, dport
25+
doc: >-
2726
A new MPTCP connection has been created. It is the good time to
2827
allocate memory and send ADD_ADDR if needed. Depending on the
2928
traffic-patterns it can take a long time until the
3029
MPTCP_EVENT_ESTABLISHED is sent.
30+
Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,
31+
dport, server-side.
3132
-
3233
name: established
33-
doc:
34-
token, family, saddr4 | saddr6, daddr4 | daddr6, sport, dport
34+
doc: >-
3535
A MPTCP connection is established (can start new subflows).
36+
Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,
37+
dport, server-side.
3638
-
3739
name: closed
38-
doc:
39-
token
40+
doc: >-
4041
A MPTCP connection has stopped.
42+
Attribute: token.
4143
-
4244
name: announced
4345
value: 6
44-
doc:
45-
token, rem_id, family, daddr4 | daddr6 [, dport]
46+
doc: >-
4647
A new address has been announced by the peer.
48+
Attributes: token, rem_id, family, daddr4 | daddr6 [, dport].
4749
-
4850
name: removed
49-
doc:
50-
token, rem_id
51+
doc: >-
5152
An address has been lost by the peer.
53+
Attributes: token, rem_id.
5254
-
5355
name: sub-established
5456
value: 10
55-
doc:
56-
token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | daddr6, sport,
57-
dport, backup, if_idx [, error]
57+
doc: >-
5858
A new subflow has been established. 'error' should not be set.
59+
Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
60+
daddr6, sport, dport, backup, if_idx [, error].
5961
-
6062
name: sub-closed
61-
doc:
62-
token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | daddr6, sport,
63-
dport, backup, if_idx [, error]
63+
doc: >-
6464
A subflow has been closed. An error (copy of sk_err) could be set if an
6565
error has been detected for this subflow.
66+
Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
67+
daddr6, sport, dport, backup, if_idx [, error].
6668
-
6769
name: sub-priority
6870
value: 13
69-
doc:
70-
token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | daddr6, sport,
71-
dport, backup, if_idx [, error]
71+
doc: >-
7272
The priority of a subflow has changed. 'error' should not be set.
73+
Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
74+
daddr6, sport, dport, backup, if_idx [, error].
7375
-
7476
name: listener-created
7577
value: 15
76-
doc:
77-
family, sport, saddr4 | saddr6
78+
doc: >-
7879
A new PM listener is created.
80+
Attributes: family, sport, saddr4 | saddr6.
7981
-
8082
name: listener-closed
81-
doc:
82-
family, sport, saddr4 | saddr6
83+
doc: >-
8384
A PM listener is closed.
85+
Attributes: family, sport, saddr4 | saddr6.
8486
8587
attribute-sets:
8688
-
@@ -306,8 +308,8 @@ operations:
306308
attributes:
307309
- addr
308310
-
309-
name: flush-addrs
310-
doc: flush addresses
311+
name: flush-addrs
312+
doc: Flush addresses
311313
attribute-set: endpoint
312314
dont-validate: [ strict ]
313315
flags: [ uns-admin-perm ]
@@ -351,7 +353,7 @@ operations:
351353
- addr-remote
352354
-
353355
name: announce
354-
doc: announce new sf
356+
doc: Announce new address
355357
attribute-set: attr
356358
dont-validate: [ strict ]
357359
flags: [ uns-admin-perm ]
@@ -362,7 +364,7 @@ operations:
362364
- token
363365
-
364366
name: remove
365-
doc: announce removal
367+
doc: Announce removal
366368
attribute-set: attr
367369
dont-validate: [ strict ]
368370
flags: [ uns-admin-perm ]
@@ -373,7 +375,7 @@ operations:
373375
- loc-id
374376
-
375377
name: subflow-create
376-
doc: todo
378+
doc: Create subflow
377379
attribute-set: attr
378380
dont-validate: [ strict ]
379381
flags: [ uns-admin-perm ]
@@ -385,7 +387,7 @@ operations:
385387
- addr-remote
386388
-
387389
name: subflow-destroy
388-
doc: todo
390+
doc: Destroy subflow
389391
attribute-set: attr
390392
dont-validate: [ strict ]
391393
flags: [ uns-admin-perm ]

0 commit comments

Comments
 (0)