Commit 14062c26 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

Merge drm/drm-fixes into drm-misc-fixes 



Backmerging to get fixes from v6.12-rc7.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents ab1c793f 2d5404ca

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -665,6 +665,7 @@ Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com> 
Thomas Graf <tgraf@suug.ch>

Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>

Thomas Pedersen <twp@codeaurora.org>

Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>

Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>

Tingwei Zhang <quic_tingwei@quicinc.com> <tingwei@codeaurora.org>

Tirupathi Reddy <quic_tirupath@quicinc.com> <tirupath@codeaurora.org>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,10 @@ S: Dreisbachstrasse 24 
S: D-57250 Netphen

S: Germany



N: Florian Fainelli

E: f.fainelli@gmail.com

D: DSA



N: Rik Faith

E: faith@acm.org

D: Future Domain TMC-16x0 SCSI driver (author)

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -6688,7 +6688,7 @@ 
			0: no polling (default)



	thp_anon=	[KNL]

			Format: <size>,<size>[KMG]:<state>;<size>-<size>[KMG]:<state>

			Format: <size>[KMG],<size>[KMG]:<state>;<size>[KMG]-<size>[KMG]:<state>

			state is one of "always", "madvise", "never" or "inherit".

			Control the default behavior of the system with respect

			to anonymous transparent hugepages.

Documentation/admin-guide/mm/transhuge.rst

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ control by passing the parameter ``transparent_hugepage=always`` or 
kernel command line.



Alternatively, each supported anonymous THP size can be controlled by

passing ``thp_anon=<size>,<size>[KMG]:<state>;<size>-<size>[KMG]:<state>``,

passing ``thp_anon=<size>[KMG],<size>[KMG]:<state>;<size>[KMG]-<size>[KMG]:<state>``,

where ``<size>`` is the THP size (must be a power of 2 of PAGE_SIZE and

supported anonymous THP)  and ``<state>`` is one of ``always``, ``madvise``,

``never`` or ``inherit``.

Documentation/devicetree/bindings/firmware/arm,scmi.yaml

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ properties: 
      atomic mode of operation, even if requested.

    default: 0



  max-rx-timeout-ms:

  arm,max-rx-timeout-ms:

    description:

      An optional time value, expressed in milliseconds, representing the

      transport maximum timeout value for the receive channel. The value should