From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Dec 2015 21:19:50 +0000 (-0800)
Subject: Merge branch 'parisc-4.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: firefly_0821_release~176^2~520
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=8db7b3c54401d83a4dc370a59b8692854000ea03;p=firefly-linux-kernel-4.4.55.git

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

Pull parisc system call restart fix from Helge Deller:
 "The architectural design of parisc always uses two instructions to
  call kernel syscalls (delayed branch feature).  This means that the
  instruction following the branch (located in the delay slot of the
  branch instruction) is executed before control passes to the branch
  destination.

  Depending on which assembler instruction and how it is used in
  usersapce in the delay slot, this sometimes made restarted syscalls
  like futex() and poll() failing with -ENOSYS"

* 'parisc-4.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix syscall restarts
---

8db7b3c54401d83a4dc370a59b8692854000ea03