Commit 230bc2be authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

Merge drm/drm-next into drm-intel-next 



To catch up with recent rounds of pull requests
and get some drm-misc dependencies so we can merge
linux/string_helpers related changes.

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parents 17003d10 38a15ad9

.mailmap

+6 −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>
@@ -330,6 +333,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com> 
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>

Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>

Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>

Rudolf Marek <R.Marek@sh.cvut.cz>

Rui Saraiva <rmps@joel.ist.utl.pt>

Documentation/ABI/testing/sysfs-class-power

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ Description: 
			auto:            Charge normally, respect thresholds

			inhibit-charge:  Do not charge while AC is attached

			force-discharge: Force discharge while AC is attached

			================ ====================================



What:		/sys/class/power_supply/<supply_name>/technology

Date:		May 2007

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/core-api/dma-attributes.rst

+8 −0
Original line number Diff line number Diff line
@@ -130,3 +130,11 @@ accesses to DMA buffers in both privileged "supervisor" and unprivileged 
subsystem that the buffer is fully accessible at the elevated privilege

level (and ideally inaccessible or at least read-only at the

lesser-privileged levels).



DMA_ATTR_OVERWRITE

------------------



This is a hint to the DMA-mapping subsystem that the device is expected to

overwrite the entire mapped size, thus the caller does not require any of the

previous buffer contents to be preserved. This allows bounce-buffering

implementations to optimise DMA_FROM_DEVICE transfers.