Skip to content

Commit a5ce83d

Browse files
frank-wfrank-w
committed
Merge tag 'v6.18.3' into 6.18-main
This is the 6.18.3 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmlXsrQACgkQONu9yGCS # aT7dAQ//bBKGv5BkKbyvc0D+bvoD19oYZ+oCxPGwi2oOb3+xio3cCP1NH5Ib6Jxa # QW3GyfS9nD0o9pwGSNL/8k3H547vuLpqrMzAReMrm/55COLEhpG6rVGwKHweA51s # S07iUcTuxdQlrjtPMjuSyG0Bj6ajd7GKpztFYqB9xpBMA/KO3wyi5rfucRfkC+0x # ezl1Vnn9rAS8sWKm/87Jse0SCXL8ugDptHhDJ15oMVh3XPPqyWjRAnMks9Sx/clN # FBr6KnLu+5CHH56H3sQDfcUeeAKukymXiG8fIwnmQaMCVTvzpe0oSDJjlW0YbSXX # dOcV7a95AAetw/66tThuglK6KcMAydP/eZEHWvo9QuJo8R4vKJO7bxGtAofKl+zJ # nOlgp0qdUPEGRuaFcDuW4wLjbbNAEkzl7Lv30EkbO/Wj8jzCU2LXctcfbooPkMUl # z1PPiG9u8nrnxq59b/DqCG/LxUM8uo20g+VrNC0ij6TFkpt63vWz9aABNpWOfD8/ # fggTu8AxqdNB4LMZWAv871VEkBzpskDWX816Rld5wnXxXOPjQEhT3aEOzIq3Gthl # UyYybqi22bS908bsoNHyi4TK/h/8YIims8tkl08VdQ0u5VE/jPzO9izsW4jPjTZp # PAqobyqpw3ozsZz4/m/sXiU79+nYGbshz/2ZFnr1tmZVm2OLvpo= # =G65A # -----END PGP SIGNATURE----- # gpg: Signature made Fri Jan 2 12:57:40 2026 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents c20affb + a607c8f commit a5ce83d

File tree

441 files changed

+4066
-1938
lines changed

Some content is hidden

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

441 files changed

+4066
-1938
lines changed

‎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
@@ -76,6 +76,11 @@ properties:
7676
items:
7777
- const: pci
7878

79+
required:
80+
- power-domains
81+
- resets
82+
- reset-names
83+
7984
allOf:
8085
- $ref: qcom,pcie-common.yaml#
8186

‎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
@@ -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-sm8250.yaml‎

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

86+
required:
87+
- power-domains
88+
- resets
89+
- reset-names
90+
8691
allOf:
8792
- $ref: qcom,pcie-common.yaml#
8893

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

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

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

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ properties:
7777
items:
7878
- const: pci
7979

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

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ properties:
8383
- const: pci # PCIe core reset
8484
- const: link_down # PCIe link down reset
8585

86+
required:
87+
- power-domains
88+
- resets
89+
- reset-names
90+
8691
allOf:
8792
- $ref: qcom,pcie-common.yaml#
8893

‎Documentation/devicetree/bindings/slimbus/slimbus.yaml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,22 @@ examples:
7575
#size-cells = <1>;
7676
ranges;
7777
78-
slim@28080000 {
78+
controller@28080000 {
7979
compatible = "qcom,slim-ngd-v1.5.0";
8080
reg = <0x091c0000 0x2c000>;
8181
interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
82-
#address-cells = <2>;
82+
dmas = <&slimbam 3>, <&slimbam 4>;
83+
dma-names = "rx", "tx";
84+
#address-cells = <1>;
8385
#size-cells = <0>;
84-
85-
audio-codec@1,0 {
86+
slim@1 {
87+
reg = <1>;
88+
#address-cells = <2>;
89+
#size-cells = <0>;
90+
codec@1,0 {
8691
compatible = "slim217,1a0";
8792
reg = <1 0>;
93+
};
8894
};
95+
};
8996
};
90-
};

‎Makefile‎

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
22
VERSION = 6
33
PATCHLEVEL = 18
4-
SUBLEVEL = 2
4+
SUBLEVEL = 3
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

0 commit comments

Comments
 (0)