Commit 86634fa4 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge v6.10-rc6 into drm-next 



The exynos-next pull is based on a newer -rc than drm-next. hence
backmerge first to make sure the unrelated conflicts we accumulated
don't end up randomly in the exynos merge pull, but are separated out.

Conflicts are all benign: Adjacent changes in amdgpu and fbdev-dma
code, and cherry-pick conflict in xe.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 27aec396 22a40d14

.editorconfig

+0 −3
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ root = true 
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]

charset = utf-8

end_of_line = lf

trim_trailing_whitespace = true

insert_final_newline = true

indent_style = tab

indent_size = 8
@@ -13,7 +12,6 @@ indent_size = 8 
[*.{json,py,rs}]

charset = utf-8

end_of_line = lf

trim_trailing_whitespace = true

insert_final_newline = true

indent_style = space

indent_size = 4
@@ -26,7 +24,6 @@ indent_size = 8 
[*.yaml]

charset = utf-8

end_of_line = lf

trim_trailing_whitespace = unset

insert_final_newline = true

indent_style = space

indent_size = 2

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com> 
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>

André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>

Andy Adamson <andros@citi.umich.edu>

Andy Shevchenko <andy@kernel.org> <andy@smile.org.ua>

Andy Shevchenko <andy@kernel.org> <ext-andriy.shevchenko@nokia.com>

Anilkumar Kolli <quic_akolli@quicinc.com> <akolli@codeaurora.org>

Anirudh Ghayal <quic_aghayal@quicinc.com> <aghayal@codeaurora.org>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
@@ -217,6 +219,7 @@ Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com> 
Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>

Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>

Geliang Tang <geliang@kernel.org> <geliangtang@163.com>

Geliang Tang <geliang@kernel.org> <tanggeliang@kylinos.cn>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
@@ -605,6 +608,7 @@ Simon Kelley <simon@thekelleys.org.uk> 
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>

Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

Documentation/admin-guide/kernel-parameters.txt

+0 −25
Original line number Diff line number Diff line
@@ -788,25 +788,6 @@ 
			Documentation/networking/netconsole.rst for an

			alternative.



		<DEVNAME>:<n>.<n>[,options]

			Use the specified serial port on the serial core bus.

			The addressing uses DEVNAME of the physical serial port

			device, followed by the serial core controller instance,

			and the serial port instance. The options are the same

			as documented for the ttyS addressing above.



			The mapping of the serial ports to the tty instances

			can be viewed with:



			$ ls -d /sys/bus/serial-base/devices/*:*.*/tty/*

			/sys/bus/serial-base/devices/00:04:0.0/tty/ttyS0



			In the above example, the console can be addressed with

			console=00:04:0.0. Note that a console addressed this

			way will only get added when the related device driver

			is ready. The use of an earlycon parameter in addition to

			the console may be desired for console output early on.



		uart[8250],io,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

		uart[8250],mmio16,<addr>[,options]
@@ -2192,12 +2173,6 @@ 
			Format: 0 | 1

			Default set by CONFIG_INIT_ON_FREE_DEFAULT_ON.



	init_mlocked_on_free=	[MM] Fill freed userspace memory with zeroes if

				it was mlock'ed and not explicitly munlock'ed

				afterwards.

				Format: 0 | 1

				Default set by CONFIG_INIT_MLOCKED_ON_FREE_DEFAULT_ON



	init_pkru=	[X86] Specify the default memory protection keys rights

			register contents for all processes.  0x55555554 by

			default (disallow access to all but pkey 0).  Can

Documentation/devicetree/bindings/dma/fsl,edma.yaml

+2 −2
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ properties: 
      - 3



  dma-channels:

    minItems: 1

    maxItems: 64

    minimum: 1

    maximum: 64



  clocks:

    minItems: 1

Documentation/devicetree/bindings/i2c/atmel,at91sam-i2c.yaml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ required: 
  - clocks



allOf:

  - $ref: i2c-controller.yaml

  - $ref: /schemas/i2c/i2c-controller.yaml#

  - if:

      properties:

        compatible: