From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Nov 2013 23:02:50 +0000 (-0800)
Subject: Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v3.13-rc1~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc6ec87d4c77029457a79fd6fa9b6f8304dc8348;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'parisc-3.13' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 - revert an access_ok() patch which broke 32bit userspace on 64bit
   kernels
 - avoid a gcc miscompilation in two internal pa_memcpy() functions by
   not inlining those
 - do not export the definition of SOCK_NONBLOCK via uapi header (fixes
   build of audit package)
 - depending on the fault type we now correctly report either SIGBUS or
   SIGSEGV
 - a small fix to not compare a size_t variable for < 0

* 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: size_t is unsigned, so comparison size < 0 doesn't make sense.
  parisc: improve SIGBUS/SIGSEGV error reporting
  parisc: break out SOCK_NONBLOCK define to own asm header file
  parisc: do not inline pa_memcpy() internal functions
  Revert "parisc: implement full version of access_ok()"
---

dc6ec87d4c77029457a79fd6fa9b6f8304dc8348