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

Commit 91a6a6cf authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/asm, to resolve conflict 



 Conflicts:
	arch/x86/mm/mem_encrypt.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d04fdafc 1c9dbd46

CREDITS

+8 −1
Original line number Diff line number Diff line
@@ -2113,6 +2113,10 @@ S: J. Obrechtstr 23 
S: NL-5216 GP 's-Hertogenbosch

S: The Netherlands



N: Ashley Lai

E: ashleydlai@gmail.com

D: IBM VTPM driver



N: Savio Lam

E: lam836@cs.cuhk.hk

D: Author of the dialog utility, foundation
@@ -3333,6 +3337,10 @@ S: Braunschweiger Strasse 79 
S: 31134 Hildesheim

S: Germany



N: Marcel Selhorst

E: tpmdd@selhorst.net

D: TPM driver



N: Darren Senn

E: sinster@darkwater.com

D: Whatever I notice needs doing (so far: itimers, /proc)
@@ -4128,7 +4136,6 @@ D: MD driver 
D: EISA/sysfs subsystem

S: France





# Don't add your name here, unless you really _are_ after Marc

# alphabetically. Leonard used to be very proud of being the 

# last entry, and he'll get positively pissed if he can't even

MAINTAINERS

+12 −13
Original line number Diff line number Diff line
@@ -10341,7 +10341,6 @@ F: drivers/pci/host/vmd.c 


PCI DRIVER FOR MICROSEMI SWITCHTEC

M:	Kurt Schwemmer <kurt.schwemmer@microsemi.com>

M:	Stephen Bates <stephen.bates@microsemi.com>

M:	Logan Gunthorpe <logang@deltatee.com>

L:	linux-pci@vger.kernel.org

S:	Maintained
@@ -10406,6 +10405,7 @@ F: drivers/pci/dwc/*keystone* 


PCI ENDPOINT SUBSYSTEM

M:	Kishon Vijay Abraham I <kishon@ti.com>

M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

L:	linux-pci@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git

S:	Supported
@@ -10457,6 +10457,15 @@ F: include/linux/pci* 
F:	arch/x86/pci/

F:	arch/x86/kernel/quirks.c



PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS

M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

L:	linux-pci@vger.kernel.org

Q:	http://patchwork.ozlabs.org/project/linux-pci/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/

S:	Supported

F:	drivers/pci/host/

F:	drivers/pci/dwc/



PCIE DRIVER FOR AXIS ARTPEC

M:	Niklas Cassel <niklas.cassel@axis.com>

M:	Jesper Nilsson <jesper.nilsson@axis.com>
@@ -10476,7 +10485,6 @@ F: drivers/pci/host/pci-thunder-* 


PCIE DRIVER FOR HISILICON

M:	Zhou Wang <wangzhou1@hisilicon.com>

M:	Gabriele Paoloni <gabriele.paoloni@huawei.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
@@ -13603,23 +13611,14 @@ F: drivers/platform/x86/toshiba-wmi.c 


TPM DEVICE DRIVER

M:	Peter Huewe <peterhuewe@gmx.de>

M:	Marcel Selhorst <tpmdd@selhorst.net>

M:	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

R:	Jason Gunthorpe <jgunthorpe@obsidianresearch.com>

W:	http://tpmdd.sourceforge.net

L:	tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)

Q:	https://patchwork.kernel.org/project/tpmdd-devel/list/

L:	linux-integrity@vger.kernel.org

Q:	https://patchwork.kernel.org/project/linux-integrity/list/

T:	git git://git.infradead.org/users/jjs/linux-tpmdd.git

S:	Maintained

F:	drivers/char/tpm/



TPM IBM_VTPM DEVICE DRIVER

M:	Ashley Lai <ashleydlai@gmail.com>

W:	http://tpmdd.sourceforge.net

L:	tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)

S:	Maintained

F:	drivers/char/tpm/tpm_ibmvtpm*



TRACING

M:	Steven Rostedt <rostedt@goodmis.org>

M:	Ingo Molnar <mingo@redhat.com>

arch/arm/kernel/traps.c

+18 −10
Original line number Diff line number Diff line
@@ -154,30 +154,26 @@ static void dump_mem(const char *lvl, const char *str, unsigned long bottom, 
	set_fs(fs);

}



static void dump_instr(const char *lvl, struct pt_regs *regs)

static void __dump_instr(const char *lvl, struct pt_regs *regs)

{

	unsigned long addr = instruction_pointer(regs);

	const int thumb = thumb_mode(regs);

	const int width = thumb ? 4 : 8;

	mm_segment_t fs;

	char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str;

	int i;



	/*

	 * We need to switch to kernel mode so that we can use __get_user

	 * to safely read from kernel space.  Note that we now dump the

	 * code first, just in case the backtrace kills us.

	 * Note that we now dump the code first, just in case the backtrace

	 * kills us.

	 */

	fs = get_fs();

	set_fs(KERNEL_DS);



	for (i = -4; i < 1 + !!thumb; i++) {

		unsigned int val, bad;



		if (thumb)

			bad = __get_user(val, &((u16 *)addr)[i]);

			bad = get_user(val, &((u16 *)addr)[i]);

		else

			bad = __get_user(val, &((u32 *)addr)[i]);

			bad = get_user(val, &((u32 *)addr)[i]);



		if (!bad)

			p += sprintf(p, i == 0 ? "(%0*x) " : "%0*x ",
@@ -188,8 +184,20 @@ static void dump_instr(const char *lvl, struct pt_regs *regs) 
		}

	}

	printk("%sCode: %s\n", lvl, str);

}



static void dump_instr(const char *lvl, struct pt_regs *regs)

{

	mm_segment_t fs;



	if (!user_mode(regs)) {

		fs = get_fs();

		set_fs(KERNEL_DS);

		__dump_instr(lvl, regs);

		set_fs(fs);

	} else {

		__dump_instr(lvl, regs);

	}

}



#ifdef CONFIG_ARM_UNWIND

arch/x86/mm/mem_encrypt.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static char sme_cmdline_off[] __initdata = "off"; 
 * section is later cleared.

 */

u64 sme_me_mask __section(.data) = 0;

EXPORT_SYMBOL_GPL(sme_me_mask);

EXPORT_SYMBOL(sme_me_mask);

DEFINE_STATIC_KEY_FALSE(sev_enable_key);

EXPORT_SYMBOL_GPL(sev_enable_key);

drivers/acpi/sleep.c

+28 −0
Original line number Diff line number Diff line
@@ -160,6 +160,14 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d) 
	return 0;

}



static bool acpi_sleep_no_lps0;



static int __init init_no_lps0(const struct dmi_system_id *d)

{

	acpi_sleep_no_lps0 = true;

	return 0;

}



static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {

	{

	.callback = init_old_suspend_ordering,
@@ -343,6 +351,19 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "80E3"),

		},

	},

	/*

	 * https://bugzilla.kernel.org/show_bug.cgi?id=196907

	 * Some Dell XPS13 9360 cannot do suspend-to-idle using the Low Power

	 * S0 Idle firmware interface.

	 */

	{

	.callback = init_no_lps0,

	.ident = "Dell XPS13 9360",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

		DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9360"),

		},

	},

	{},

};
@@ -485,6 +506,7 @@ static void acpi_pm_end(void) 
}

#else /* !CONFIG_ACPI_SLEEP */

#define acpi_target_sleep_state	ACPI_STATE_S0

#define acpi_sleep_no_lps0	(false)

static inline void acpi_sleep_dmi_check(void) {}

#endif /* CONFIG_ACPI_SLEEP */
@@ -863,6 +885,12 @@ static int lps0_device_attach(struct acpi_device *adev, 
	if (lps0_device_handle)

		return 0;



	if (acpi_sleep_no_lps0) {

		acpi_handle_info(adev->handle,

				 "Low Power S0 Idle interface disabled\n");

		return 0;

	}



	if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))

		return 0;