Merge branch 'parisc-5.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Feb 2019 00:12:01 +0000 (16:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Feb 2019 00:12:01 +0000 (16:12 -0800)
commit8456e98e18f35f4d4376e8ff3110a3342f81ce9b
treeb8772abf9ae7eb5d09f302abcdd9f946ba8487e5
parent77dc1181d896c5c3f8e131e341993aef41e16505
parent71d73a0b43c2b101a960c624290c8a053d174cac
Merge branch 'parisc-5.0-1' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 "Fix ptrace syscall number modification which has been broken since
  kernel v4.5 and provide alternative email addresses for the remaining
  users of the retired parisc-linux.org email domain"

* 'parisc-5.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  CREDITS/MAINTAINERS: Retire parisc-linux.org email domain
  parisc: Fix ptrace syscall number modification