Commit 9b40e16e authored Sep 27, 2021 by Greg Kroah-Hartman

Merge branch 5.15-rc3 into staging-next



We need the fixes in here, and it resolves a merge issue with
	drivers/staging/r8188eu/os_dep/ioctl_linux.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parents c34e73d6 5816b3e6

Documentation/admin-guide/README.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ Configuring the kernel
		Compiling the kernel
		--------------------

		- Make sure you have at least gcc 4.9 available.
		- Make sure you have at least gcc 5.1 available.
		For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.

		Please note that you can still run a.out user programs with this kernel.

Documentation/core-api/irq/irq-domain.rst

+3 −2

Original line number	Diff line number	Diff line
		@@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that
		case the Linux IRQ numbers cannot be dynamically assigned and the legacy
		mapping should be used.

		As the name implies, the *_legacy() functions are deprecated and only
		As the name implies, the \*_legacy() functions are deprecated and only
		exist to ease the support of ancient platforms. No new users should be
		added.
		added. Same goes for the \*_simple() functions when their use results
		in the legacy behaviour.

		The legacy map assumes a contiguous range of IRQ numbers has already
		been allocated for the controller and that the IRQ number can be

Documentation/devicetree/bindings/arm/tegra.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ properties:
		- const: toradex,apalis_t30
		- const: nvidia,tegra30
		- items:
		- const: toradex,apalis_t30-eval-v1.1
		- const: toradex,apalis_t30-v1.1-eval
		- const: toradex,apalis_t30-eval
		- const: toradex,apalis_t30-v1.1
		- const: toradex,apalis_t30

Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ function block.

		All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.
		For a description of the MMSYS_CONFIG binding, see
		Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt.
		Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.

		DISP function blocks
		====================

Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml

+3 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,9 @@ properties:
		- const: allwinner,sun8i-v3s-emac
		- const: allwinner,sun50i-a64-emac
		- items:
		- const: allwinner,sun50i-h6-emac
		- enum:
		- allwinner,sun20i-d1-emac
		- allwinner,sun50i-h6-emac
		- const: allwinner,sun50i-a64-emac

		reg: