Skip to content

Commit 38713c6

Browse files
committed
Merge branches 'apple/dart', 'arm/mediatek', 'arm/omap', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next
8 parents a380b8d + 717ec15 + 184233a + d2f2f1d + 0c9ccaf + 6ad931a + f9e2f0e + 4f58330 commit 38713c6

File tree

729 files changed

+7100
-5453
lines changed

Some content is hidden

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

729 files changed

+7100
-5453
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ Morten Welinder <[email protected]>
315315
Mythri P K <[email protected]>
316316
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
317317
318+
318319
Nguyen Anh Quynh <[email protected]>
319320
320321

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,8 @@
321321
force_enable - Force enable the IOMMU on platforms known
322322
to be buggy with IOMMU enabled. Use this
323323
option with care.
324+
pgtbl_v1 - Use v1 page table for DMA-API (Default).
325+
pgtbl_v2 - Use v2 page table for DMA-API.
324326

325327
amd_iommu_dump= [HW,X86-64]
326328
Enable AMD IOMMU driver option to dump the ACPI table

Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
88
title: Amlogic Meson Firmware registers Interface
99

1010
maintainers:
11-
- Neil Armstrong <[email protected]>
11+
- Neil Armstrong <[email protected]>
1212

1313
description: |
1414
The Meson SoCs have a register bank with status and data shared with the

Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
88
title: Amlogic specific extensions to the Synopsys Designware HDMI Controller
99

1010
maintainers:
11-
- Neil Armstrong <[email protected]>
11+
- Neil Armstrong <[email protected]>
1212

1313
allOf:
1414
- $ref: /schemas/sound/name-prefix.yaml#

Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
88
title: Amlogic Meson Display Controller
99

1010
maintainers:
11-
- Neil Armstrong <[email protected]>
11+
- Neil Armstrong <[email protected]>
1212

1313
description: |
1414
The Amlogic Meson Display controller is composed of several components

Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Analogix ANX7814 SlimPort (Full-HD Transmitter)
88

99
maintainers:
1010
- Andrzej Hajda <[email protected]>
11-
- Neil Armstrong <[email protected]>
11+
- Neil Armstrong <[email protected]>
1212
- Robert Foss <[email protected]>
1313

1414
properties:

Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: ITE it66121 HDMI bridge Device Tree Bindings
88

99
maintainers:
1010
- Phong LE <[email protected]>
11-
- Neil Armstrong <[email protected]>
11+
- Neil Armstrong <[email protected]>
1212

1313
description: |
1414
The IT66121 is a high-performance and low-power single channel HDMI

Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.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: Solomon Goldentek Display GKTW70SDAE4SE 7" WVGA LVDS Display Panel
88

99
maintainers:
10-
- Neil Armstrong <[email protected]>
10+
- Neil Armstrong <[email protected]>
1111
- Thierry Reding <[email protected]>
1212

1313
allOf:

Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Example:
3434
Use specific request line passing from dma
3535
For example, MMC request line is 5
3636

37-
sdhci: sdhci@98e00000 {
38-
compatible = "moxa,moxart-sdhci";
37+
mmc: mmc@98e00000 {
38+
compatible = "moxa,moxart-mmc";
3939
reg = <0x98e00000 0x5C>;
4040
interrupts = <5 0>;
4141
clocks = <&clk_apb>;

Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ required:
4848
- compatible
4949
- reg
5050
- reg-names
51-
- intel,vm-map
5251
- clocks
5352
- resets
5453
- "#thermal-sensor-cells"

0 commit comments

Comments
 (0)