Skip to content

Commit e14d267

Browse files
frank-wfrank-w
committed
Merge tag 'v6.12.64' into 6.12-main
This is the 6.12.64 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmlfdbwACgkQONu9yGCS # aT57BBAAwpI/+uCnKdlhuwF1pxtAoPi8pfs/R9BZYgcdBCSvbwuvajS4FQQAZPLm # aSYIbu8shQdqhcADAnGlMkCA6Liz3N7TsTQ+3ZiTkKH3yxkmDnea8wpzvtW1kSLT # dbXQW5xpyw77742P600yYM2EsW/fh7mgxtFqU8FZ5ppGXBlW7ivJVO65B5+lYJ3q # 1UBnKflBSZMSDK1ZogDL4u0oC3vw+Rb/TMVI9ouNPIZPMSjeb+GfEKKLPWnVcLXh # Nf1qcycQtMl9enuRf9mE+yXTMUXZ44b8pz0M5HWOEmye8vGWN/uylQYoynK4wdT9 # Xqwh2npPIK7yz8HYdNGJJ739j/yDXBEo9ycsDyEiQ4rMXkzzeu0hDtVGR3EsO0Kf # 4JonoAXTA3RRk/9WjYpmWD8BWV4S92QHyV0qHulkQHDPhQN8amBEoRBD9IRlWW2I # 8cWkHNzZByhjLt0RJENUNgBCXhYTMUy47rEFnOGKub6ZBK+rey/wyBfe8I+EukXd # PWOoREXH8Ak1oRH2eEImN8X6QK/0QsQrzECfYX0IgDa3PzLKAShRJNKk93q60fkA # HREVdHR1kiFBgR6BY427TVy1VJ3ixN9ZoBJ5Pi107q5L7UsRN9C7cURVcQ3h2NLk # eHsONB4f1wzyvM9X9odZfheYDqpMU3lyYiQffKwvXqRauBeltOk= # =g/W3 # -----END PGP SIGNATURE----- # gpg: Signature made Thu Jan 8 10:15:40 2026 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 3729869 + 1a4a724 commit e14d267

607 files changed

Lines changed: 5887 additions & 3765 deletions

File tree

Some content is hidden

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

‎Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ properties:
4141
patternProperties:
4242
"^sdhci@[0-9a-f]+$":
4343
type: object
44-
$ref: mmc-controller.yaml
44+
$ref: sdhci-common.yaml
4545
unevaluatedProperties: false
4646

4747
properties:

‎Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ properties:
7474
items:
7575
- const: pci
7676

77+
required:
78+
- power-domains
79+
- resets
80+
- reset-names
81+
7782
allOf:
7883
- $ref: qcom,pcie-common.yaml#
7984

‎Documentation/devicetree/bindings/pci/qcom,pcie-sc8280xp.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ properties:
6161
required:
6262
- interconnects
6363
- interconnect-names
64+
- power-domains
65+
- resets
66+
- reset-names
6467

6568
allOf:
6669
- $ref: qcom,pcie-common.yaml#

‎Documentation/devicetree/bindings/pci/qcom,pcie-sm8150.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ properties:
6969
items:
7070
- const: pci
7171

72+
required:
73+
- power-domains
74+
- resets
75+
- reset-names
76+
7277
allOf:
7378
- $ref: qcom,pcie-common.yaml#
7479

‎Documentation/devicetree/bindings/pci/qcom,pcie-sm8250.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ properties:
8181
items:
8282
- const: pci
8383

84+
required:
85+
- power-domains
86+
- resets
87+
- reset-names
88+
8489
allOf:
8590
- $ref: qcom,pcie-common.yaml#
8691

‎Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ properties:
7171
items:
7272
- const: pci
7373

74+
required:
75+
- power-domains
76+
- resets
77+
- reset-names
78+
7479
allOf:
7580
- $ref: qcom,pcie-common.yaml#
7681

‎Documentation/devicetree/bindings/pci/qcom,pcie-sm8450.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ properties:
8181
items:
8282
- const: pci
8383

84+
required:
85+
- power-domains
86+
- resets
87+
- reset-names
88+
8489
allOf:
8590
- $ref: qcom,pcie-common.yaml#
8691

‎Documentation/devicetree/bindings/pci/qcom,pcie-sm8550.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ properties:
7878
- const: pci # PCIe core reset
7979
- const: link_down # PCIe link down reset
8080

81+
required:
82+
- power-domains
83+
- resets
84+
- reset-names
85+
8186
allOf:
8287
- $ref: qcom,pcie-common.yaml#
8388

‎Documentation/driver-api/soundwire/stream.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ per stream. From ASoC DPCM framework, this stream state maybe linked to
291291

292292
.. code-block:: c
293293
294-
int sdw_alloc_stream(char * stream_name);
294+
int sdw_alloc_stream(char * stream_name, enum sdw_stream_type type);
295295
296296
The SoundWire core provides a sdw_startup_stream() helper function,
297297
typically called during a dailink .startup() callback, which performs

‎Documentation/driver-api/tty/tty_port.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ TTY Refcounting
4242
TTY Helpers
4343
-----------
4444

45+
.. kernel-doc:: include/linux/tty_port.h
46+
:identifiers: tty_port_tty_hangup tty_port_tty_vhangup
4547
.. kernel-doc:: drivers/tty/tty_port.c
46-
:identifiers: tty_port_tty_hangup tty_port_tty_wakeup
47-
48+
:identifiers: tty_port_tty_wakeup
4849

4950
Modem Signals
5051
-------------

0 commit comments

Comments
 (0)