From: Linus Torvalds Date: Mon, 30 Jan 2017 23:47:19 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f9a42e0d58cf0fe3d902e63d4582f2ea4cd2bb8b;p=linux-beck.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc Pull sparc fixes from David Miller: "Several small bug fixes and tidies, along with a fix for non-resumable memory errors triggered by userspace" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Handle PIO & MEM non-resumable errors. sparc64: Zero pages on allocation for mondo and error queues. sparc: Fixed typo in sstate.c. Replaced panicing with panicking sparc: use symbolic names for tsb indexing --- f9a42e0d58cf0fe3d902e63d4582f2ea4cd2bb8b