Commit c5c34f57 authored Oct 11, 2021 by Wolfram Sang

Merge branch 'i2c/for-current' into i2c/for-mergewindow

parents 669b2e4a 64570fbc

CREDITS

+1 −0

Original line number	Diff line number	Diff line
		@@ -971,6 +971,7 @@ D: PowerPC
		N: Daniel Drake
		E: dsd@gentoo.org
		D: USBAT02 CompactFlash support in usb-storage
		D: ZD1211RW wireless driver
		S: UK

		N: Oleg Drokin

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/admin-guide/kernel-parameters.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -1266,7 +1266,7 @@
		The VGA and EFI output is eventually overwritten by
		the real console.

		The xen output can only be used by Xen PV guests.
		The xen option can only be used in Xen domains.

		The sclp output can only be used on s390.

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