Commit b9c7babe authored by Dave Airlie's avatar Dave Airlie
Browse files

Backmerge tag 'v5.17-rc4' of... 

Backmerge tag 'v5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

 into drm-next

Daniel asked for this for some intel deps, so let's do it now.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 123db17d 754e0b0e

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org> 
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>

Christian Brauner <brauner@kernel.org> <christian@brauner.io>

Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>

Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing

+3 −3
Original line number Diff line number Diff line 
What:		/sys/bus/platform/drivers/aspeed-uart-routing/*/uart*

What:		/sys/bus/platform/drivers/aspeed-uart-routing/\*/uart\*

Date:		September 2021

Contact:	Oskar Senft <osk@google.com>

		Chia-Wei Wang <chiawei_wang@aspeedtech.com>
@@ -9,7 +9,7 @@ Description: Selects the RX source of the UARTx device. 
		depends on the selected file.



		e.g.

		cat /sys/bus/platform/drivers/aspeed-uart-routing/*.uart_routing/uart1

		cat /sys/bus/platform/drivers/aspeed-uart-routing/\*.uart_routing/uart1

		[io1] io2 io3 io4 uart2 uart3 uart4 io6



		In this case, UART1 gets its input from IO1 (physical serial port 1).
@@ -17,7 +17,7 @@ Description: Selects the RX source of the UARTx device. 
Users:		OpenBMC.  Proposed changes should be mailed to

		openbmc@lists.ozlabs.org



What:		/sys/bus/platform/drivers/aspeed-uart-routing/*/io*

What:		/sys/bus/platform/drivers/aspeed-uart-routing/\*/io\*

Date:		September 2021

Contact:	Oskar Senft <osk@google.com>

		Chia-Wei Wang <chiawei_wang@aspeedtech.com>

Documentation/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A510     | #2051678        | ARM64_ERRATUM_2051678       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A510     | #2077057        | ARM64_ERRATUM_2077057       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A710     | #2119858        | ARM64_ERRATUM_2119858       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A710     | #2054223        | ARM64_ERRATUM_2054223       |

Documentation/dev-tools/kselftest.rst

+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,14 @@ directory. These are intended to be small tests to exercise individual code 
paths in the kernel. Tests are intended to be run after building, installing

and booting a kernel.



Kselftest from mainline can be run on older stable kernels. Running tests

from mainline offers the best coverage. Several test rings run mainline

kselftest suite on stable releases. The reason is that when a new test

gets added to test existing code to regression test a bug, we should be

able to run that test on an older kernel. Hence, it is important to keep

code that can still test an older kernel and make sure it skips the test

gracefully on newer releases.



You can find additional information on Kselftest framework, how to

write new tests using the framework on Kselftest wiki:

Documentation/dev-tools/kunit/usage.rst

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ example: 


	int rectangle_area(struct shape *this)

	{

		struct rectangle *self = container_of(this, struct shape, parent);

		struct rectangle *self = container_of(this, struct rectangle, parent);



		return self->length * self->width;

	};