Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ccd8d74 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.11-rc5 into tty-next 



We want the serial fixes in here as well to handle merge issues.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents abf1e0a9 a71c9a1c

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1725,6 +1725,12 @@ 
			kernel and module base offset ASLR (Address Space

			Layout Randomization).



	kasan_multi_shot

			[KNL] Enforce KASAN (Kernel Address Sanitizer) to print

			report on every invalid memory access. Without this

			parameter KASAN will print report only for the first

			invalid access.



	keepinitrd	[HW,ARM]



	kernelcore=	[KNL,X86,IA-64,PPC]

Documentation/devicetree/bindings/rng/omap_rng.txt

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ Required properties: 
- reg : Offset and length of the register set for the module

- interrupts : the interrupt number for the RNG module.

		Used for "ti,omap4-rng" and "inside-secure,safexcel-eip76"

- clocks: the trng clock source

- clocks: the trng clock source. Only mandatory for the

  "inside-secure,safexcel-eip76" compatible.



Example:

/* AM335x */

Documentation/virtual/kvm/api.txt

+63 −0
Original line number Diff line number Diff line
@@ -3377,6 +3377,69 @@ struct kvm_ppc_resize_hpt { 
	__u32 pad;

};



4.104 KVM_X86_GET_MCE_CAP_SUPPORTED



Capability: KVM_CAP_MCE

Architectures: x86

Type: system ioctl

Parameters: u64 mce_cap (out)

Returns: 0 on success, -1 on error



Returns supported MCE capabilities. The u64 mce_cap parameter

has the same format as the MSR_IA32_MCG_CAP register. Supported

capabilities will have the corresponding bits set.



4.105 KVM_X86_SETUP_MCE



Capability: KVM_CAP_MCE

Architectures: x86

Type: vcpu ioctl

Parameters: u64 mcg_cap (in)

Returns: 0 on success,

         -EFAULT if u64 mcg_cap cannot be read,

         -EINVAL if the requested number of banks is invalid,

         -EINVAL if requested MCE capability is not supported.



Initializes MCE support for use. The u64 mcg_cap parameter

has the same format as the MSR_IA32_MCG_CAP register and

specifies which capabilities should be enabled. The maximum

supported number of error-reporting banks can be retrieved when

checking for KVM_CAP_MCE. The supported capabilities can be

retrieved with KVM_X86_GET_MCE_CAP_SUPPORTED.



4.106 KVM_X86_SET_MCE



Capability: KVM_CAP_MCE

Architectures: x86

Type: vcpu ioctl

Parameters: struct kvm_x86_mce (in)

Returns: 0 on success,

         -EFAULT if struct kvm_x86_mce cannot be read,

         -EINVAL if the bank number is invalid,

         -EINVAL if VAL bit is not set in status field.



Inject a machine check error (MCE) into the guest. The input

parameter is:



struct kvm_x86_mce {

	__u64 status;

	__u64 addr;

	__u64 misc;

	__u64 mcg_status;

	__u8 bank;

	__u8 pad1[7];

	__u64 pad2[3];

};



If the MCE being reported is an uncorrected error, KVM will

inject it as an MCE exception into the guest. If the guest

MCG_STATUS register reports that an MCE is in progress, KVM

causes an KVM_EXIT_SHUTDOWN vmexit.



Otherwise, if the MCE is a corrected error, KVM will just

store it in the corresponding bank (provided this bank is

not holding a previously reported uncorrected error).



5. The kvm_run structure

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

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -4775,6 +4775,12 @@ L: linux-edac@vger.kernel.org 
S:	Maintained

F:	drivers/edac/mpc85xx_edac.[ch]



EDAC-PND2

M:	Tony Luck <tony.luck@intel.com>

L:	linux-edac@vger.kernel.org

S:	Maintained

F:	drivers/edac/pnd2_edac.[ch]



EDAC-PASEMI

M:	Egor Martovetsky <egor@pasemi.com>

L:	linux-edac@vger.kernel.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Fearless Coyote



# *DOCUMENTATION*