Merge drm/drm-next into drm-intel-gt-next (647bfd26) · Commits · EulixOS / Software / Kernel

.mailmap

+10 −0

Original line number	Diff line number	Diff line
		@@ -10,10 +10,12 @@
		# Please keep this list dictionary sorted.
		#
		Aaron Durbin <adurbin@google.com>
		Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
		Adam Oldham <oldhamca@gmail.com>
		Adam Radford <aradford@gmail.com>
		Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
		Adrian Bunk <bunk@stusta.de>
		Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>
		Alan Cox <alan@lxorguk.ukuu.org.uk>
		Alan Cox <root@hraefn.swansea.linux.org.uk>
		Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
		@@ -126,6 +128,8 @@ Greg Kroah-Hartman <gregkh@suse.de>
		Greg Kroah-Hartman <greg@kroah.com>
		Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
		Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
		Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>
		Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>
		Gustavo Padovan <gustavo@las.ic.unicamp.br>
		Gustavo Padovan <padovan@profusion.mobi>
		Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
		@@ -170,6 +174,7 @@ Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
		Jens Axboe <axboe@suse.de>
		Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
		Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
		Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
		Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
		Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
		Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
		@@ -189,6 +194,7 @@ Juha Yrjola <at solidboot.com>
		Juha Yrjola <juha.yrjola@nokia.com>
		Juha Yrjola <juha.yrjola@solidboot.com>
		Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
		Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
		Kay Sievers <kay.sievers@vrfy.org>
		Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
		Kees Cook <keescook@chromium.org> <keescook@google.com>
		@@ -200,9 +206,11 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
		Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
		Koushik <raghavendra.koushik@neterion.com>
		Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
		Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
		Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
		Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
		Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
		Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
		@@ -309,6 +317,7 @@ Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
		Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
		Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
		Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
		Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
		Rajesh Shah <rajesh.shah@intel.com>
		Ralf Baechle <ralf@linux-mips.org>
		Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
		@@ -323,6 +332,7 @@ Rui Saraiva <rmps@joel.ist.utl.pt>
		Sachin P Sant <ssant@in.ibm.com>
		Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
		Sam Ravnborg <sam@mars.ravnborg.org>
		Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
		Santosh Shilimkar <santosh.shilimkar@oracle.org>
		Santosh Shilimkar <ssantosh@kernel.org>
		Sarangdhar Joshi <spjoshi@codeaurora.org>

Documentation/admin-guide/blockdev/drbd/figures.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,6 @@ Sub graphs of DRBD's state transitions
		:alt: disk-states-8.dot
		:align: center

		.. kernel-figure:: node-states-8.dot
		:alt: node-states-8.dot
		.. kernel-figure:: peer-states-8.dot
		:alt: peer-states-8.dot
		:align: center

Documentation/admin-guide/blockdev/drbd/node-states-8.dot→Documentation/admin-guide/blockdev/drbd/peer-states-8.dot

+0 −5

Original line number	Diff line number	Diff line
		digraph node_states {
		Secondary -> Primary [ label = "ioctl_set_state()" ]
		Primary -> Secondary [ label = "ioctl_set_state()" ]
		}

		digraph peer_states {
		Secondary -> Primary [ label = "recv state packet" ]
		Primary -> Secondary [ label = "recv state packet" ]

Documentation/admin-guide/kernel-parameters.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -3545,6 +3545,13 @@
		shutdown the other cpus. Instead use the REBOOT_VECTOR
		irq.

		nomodeset Disable kernel modesetting. DRM drivers will not perform
		display-mode changes or accelerated rendering. Only the
		system framebuffer will be available for use if this was
		set-up by the firmware or boot loader.

		Useful as fallback, or for testing and debugging.

		nomodule Disable module load

		nopat [X86] Disable PAT (page attribute table extension of

Documentation/arm64/pointer-authentication.rst

+4 −5

Original line number	Diff line number	Diff line
		@@ -53,11 +53,10 @@ The number of bits that the PAC occupies in a pointer is 55 minus the
		virtual address size configured by the kernel. For example, with a
		virtual address size of 48, the PAC is 7 bits wide.

		Recent versions of GCC can compile code with APIAKey-based return
		address protection when passed the -msign-return-address option. This
		uses instructions in the HINT space (unless -march=armv8.3-a or higher
		is also passed), and such code can run on systems without the pointer
		authentication extension.
		When ARM64_PTR_AUTH_KERNEL is selected, the kernel will be compiled
		with HINT space pointer authentication instructions protecting
		function returns. Kernels built with this option will work on hardware
		with or without pointer authentication support.

		In addition to exec(), keys can also be reinitialized to random values
		using the PR_PAC_RESET_KEYS prctl. A bitmask of PR_PAC_APIAKEY,