Skip to content
  • Linus Torvalds's avatar
    Merge branch 'parisc-3.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 54f8c2aa
    Linus Torvalds authored
    Pull parisc fixes from Helge Deller:
     "The major patch in here is one which fixes the fanotify_mark() syscall
      in the compat layer of the 64bit parisc kernel.  It went unnoticed so
      long, because the calling syntax when using a 64bit parameter in a
      32bit syscall is quite complex and even worse, it may be even
      different if you call syscall() or the glibc wrapper.  This patch
      makes the kernel accept the calling convention when called by the
      glibc wrapper.
    
      The other two patches are trivial and remove unused headers, #includes
      and adds the serial ports of the fastest C8000 workstation to the
      parisc-kernel internal hardware database"
    
    * 'parisc-3.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
      parisc: drop unused defines and header includes
      parisc: fix fanotify_mark() syscall on 32bit compat kernel
      parisc: add serial ports of C8000/1GHz machine to hardware database
    54f8c2aa