Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (fdae5f37) · Commits · e / devices / android_kernel_fairphone_FP4

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Linas Vepstas <linas@austin.ibm.com>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Mark Brown <broonie@sirena.org.uk>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

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
		@@ -10349,7 +10349,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
		@@ -10414,6 +10413,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
		@@ -10465,6 +10465,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>
		@@ -10484,7 +10493,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
		@@ -13621,23 +13629,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 ? "(%0x) " : "%0x ",
		@@ -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/mips/ar7/platform.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -575,6 +575,7 @@ static int __init ar7_register_uarts(void)
		uart_port.type = PORT_AR7;
		uart_port.uartclk = clk_get_rate(bus_clk) / 2;
		uart_port.iotype = UPIO_MEM32;
		uart_port.flags = UPF_FIXED_TYPE;
		uart_port.regshift = 2;

		uart_port.line = 0;
		@@ -653,6 +654,10 @@ static int __init ar7_register_devices(void)
		u32 val;
		int res;

		res = ar7_gpio_init();
		if (res)
		pr_warn("unable to register gpios: %d\n", res);

		res = ar7_register_uarts();
		if (res)
		pr_err("unable to setup uart(s): %d\n", res);