Commit 0422fe26 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into irq/core, to fix conflict 



Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 4b3ddc64 d1587f7b

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,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>

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

+8 −2
Original line number Diff line number Diff line
@@ -1689,6 +1689,8 @@ 
			architectures force reset to be always executed

	i8042.unlock	[HW] Unlock (ignore) the keylock

	i8042.kbdreset	[HW] Reset device connected to KBD port

	i8042.probe_defer

			[HW] Allow deferred probing upon i8042 probe errors



	i810=		[HW,DRM]
@@ -2413,8 +2415,12 @@ 
			Default is 1 (enabled)



	kvm-intel.emulate_invalid_guest_state=

			[KVM,Intel] Enable emulation of invalid guest states

			Default is 0 (disabled)

			[KVM,Intel] Disable emulation of invalid guest state.

			Ignored if kvm-intel.enable_unrestricted_guest=1, as

			guest state is never invalid for unrestricted guests.

			This param doesn't apply to nested guests (L2), as KVM

			never emulates invalid L2 guest state.

			Default is 1 (enabled)



	kvm-intel.flexpriority=

			[KVM,Intel] Disable FlexPriority feature (TPR shadow).

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,