Commit a12c6892 authored Sep 25, 2022 by Greg Kroah-Hartman

Merge 7e2cd21e ("Merge tag 'tty-6.0-rc7' of...

Merge 7e2cd21e ("Merge tag 'tty-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty"

) into tty-next

We need the tty fixes and api additions in this branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parents 4c892885 7e2cd21e

.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/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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ title: Analogix ANX7814 SlimPort (Full-HD Transmitter)

		maintainers:
		- Andrzej Hajda <andrzej.hajda@intel.com>
		- Neil Armstrong <narmstrong@baylibre.com>
		- Neil Armstrong <neil.armstrong@linaro.org>
		- Robert Foss <robert.foss@linaro.org>

		properties: