From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Oct 2014 18:46:09 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v3.18-rc1~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5e2ee7cd58fcee6c6cc954642faa584f54c8391e;p=users%2Fdwmw2%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Here we have two bug fixes:

  1) The current thread's fault_code is not setup properly upon entry to
     do_sparc64_fault() in some paths, leading to spurious SIGBUS.

  2) Don't use a zero length array at the end of thread_info on sparc64,
     otherwise end_of_stack() isn't right"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Do not define thread fpregs save area as zero-length array.
  sparc64: Fix corrupted thread fault code.
---

5e2ee7cd58fcee6c6cc954642faa584f54c8391e