Skip to content

Commit 9769e44

Browse files
committed
Merge branch 'for-next' into for-linus
2 parents f38e645 + be561ff commit 9769e44

File tree

1,146 files changed

+33564
-5322
lines changed

Some content is hidden

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

1,146 files changed

+33564
-5322
lines changed

Documentation/ABI/testing/sysfs-ata

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,14 @@ Description:
107107
described in ATA8 7.16 and 7.17. Only valid if
108108
the device is not a PM.
109109

110-
pio_mode: (RO) Transfer modes supported by the device when
111-
in PIO mode. Mostly used by PATA device.
110+
pio_mode: (RO) PIO transfer mode used by the device.
111+
Mostly used by PATA devices.
112112

113-
xfer_mode: (RO) Current transfer mode
113+
xfer_mode: (RO) Current transfer mode. Mostly used by
114+
PATA devices.
114115

115-
dma_mode: (RO) Transfer modes supported by the device when
116-
in DMA mode. Mostly used by PATA device.
116+
dma_mode: (RO) DMA transfer mode used by the device.
117+
Mostly used by PATA devices.
117118

118119
class: (RO) Device class. Can be "ata" for disk,
119120
"atapi" for packet device, "pmp" for PM, or

Documentation/ABI/testing/sysfs-driver-bd9571mwv-regulator

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ Description: Read/write the current state of DDR Backup Mode, which controls
2626
DDR Backup Mode must be explicitly enabled by the user,
2727
to invoke step 1.
2828

29-
See also Documentation/devicetree/bindings/mfd/bd9571mwv.txt.
29+
See also Documentation/devicetree/bindings/mfd/rohm,bd9571mwv.yaml.
3030
Users: User space applications for embedded boards equipped with a
3131
BD9571MWV PMIC.

Documentation/arm/tcm.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CPU so it is usually wise not to overlap any physical RAM with
3434
the TCM.
3535

3636
The TCM memory can then be remapped to another address again using
37-
the MMU, but notice that the TCM if often used in situations where
37+
the MMU, but notice that the TCM is often used in situations where
3838
the MMU is turned off. To avoid confusion the current Linux
3939
implementation will map the TCM 1 to 1 from physical to virtual
4040
memory in the location specified by the kernel. Currently Linux

Documentation/arm64/sme.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ The regset data starts with struct user_za_header, containing:
371371
Appendix A. SME programmer's model (informative)
372372
=================================================
373373

374-
This section provides a minimal description of the additions made by SVE to the
374+
This section provides a minimal description of the additions made by SME to the
375375
ARMv8-A programmer's model that are relevant to this document.
376376

377377
Note: This section is for information only and not intended to be complete or

Documentation/devicetree/bindings/clock/idt,versaclock5.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ description: |
4545
The case where SH and SP are both 1 is likely not very interesting.
4646
4747
maintainers:
48-
- Luca Ceresoli <luca@lucaceresoli.net>
48+
- Luca Ceresoli <luca[email protected]>
4949

5050
properties:
5151
compatible:

Documentation/devicetree/bindings/cpufreq/brcm,stb-avs-cpu-freq.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ has been processed. See [2] for more information on the brcm,l2-intc node.
1616
firmware. On some SoCs, this firmware supports DFS and DVFS in addition to
1717
Adaptive Voltage Scaling.
1818

19-
[2] Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.txt
19+
[2] Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.yaml
2020

2121

2222
Node brcm,avs-cpu-data-mem

Documentation/devicetree/bindings/display/arm,malidp.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ properties:
7171
- description: number of output lines for the green channel (G)
7272
- description: number of output lines for the blue channel (B)
7373

74-
arm,malidp-arqos-high-level:
75-
$ref: /schemas/types.yaml#/definitions/uint32
76-
description:
77-
integer describing the ARQoS levels of DP500's QoS signaling
78-
7974
arm,malidp-arqos-value:
8075
$ref: /schemas/types.yaml#/definitions/uint32
8176
description:
@@ -113,7 +108,7 @@ examples:
113108
clocks = <&oscclk2>, <&fpgaosc0>, <&fpgaosc1>, <&fpgaosc1>;
114109
clock-names = "pxlclk", "mclk", "aclk", "pclk";
115110
arm,malidp-output-port-lines = /bits/ 8 <8 8 8>;
116-
arm,malidp-arqos-high-level = <0xd000d000>;
111+
arm,malidp-arqos-value = <0xd000d000>;
117112
118113
port {
119114
dp0_output: endpoint {

Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Display DPU dt properties for SC7180 target
88

99
maintainers:
10-
- Krishna Manikandan <[email protected]>
10+
- Krishna Manikandan <[email protected]>
1111

1212
description: |
1313
Device tree bindings for MSM Mobile Display Subsystem(MDSS) that encapsulates

Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Display DPU dt properties for SC7280
88

99
maintainers:
10-
- Krishna Manikandan <[email protected]>
10+
- Krishna Manikandan <[email protected]>
1111

1212
description: |
1313
Device tree bindings for MSM Mobile Display Subsystem (MDSS) that encapsulates

Documentation/devicetree/bindings/display/msm/dpu-sdm845.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Display DPU dt properties for SDM845 target
88

99
maintainers:
10-
- Krishna Manikandan <[email protected]>
10+
- Krishna Manikandan <[email protected]>
1111

1212
description: |
1313
Device tree bindings for MSM Mobile Display Subsystem(MDSS) that encapsulates

0 commit comments

Comments
 (0)