Commit 38713c60 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'apple/dart', 'arm/mediatek', 'arm/omap', 'arm/smmu', 'virtio',... 

Merge branches 'apple/dart', 'arm/mediatek', 'arm/omap', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next
parents a380b8dc 717ec15e 184233a5 d2f2f1d1 0c9ccaf2 6ad931a2 f9e2f0e8 4f58330f

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ Morten Welinder <welinder@troll.com> 
Mythri P K <mythripk@ti.com>

Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>

Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>

Nguyen Anh Quynh <aquynh@gmail.com>

Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>

Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>

Documentation/admin-guide/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ 
			force_enable - Force enable the IOMMU on platforms known

				       to be buggy with IOMMU enabled. Use this

				       option with care.

			pgtbl_v1     - Use v1 page table for DMA-API (Default).

			pgtbl_v2     - Use v2 page table for DMA-API.



	amd_iommu_dump=	[HW,X86-64]

			Enable AMD IOMMU driver option to dump the ACPI table

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

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#" 
title: Amlogic Meson Firmware registers Interface



maintainers:

  - Neil Armstrong <narmstrong@baylibre.com>

  - Neil Armstrong <neil.armstrong@linaro.org>



description: |

  The Meson SoCs have a register bank with status and data shared with the

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

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#" 
title: Amlogic specific extensions to the Synopsys Designware HDMI Controller



maintainers:

  - Neil Armstrong <narmstrong@baylibre.com>

  - Neil Armstrong <neil.armstrong@linaro.org>



allOf:

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

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

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#" 
title: Amlogic Meson Display Controller



maintainers:

  - Neil Armstrong <narmstrong@baylibre.com>

  - Neil Armstrong <neil.armstrong@linaro.org>



description: |

  The Amlogic Meson Display controller is composed of several components