From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jun 2018 21:16:30 +0000 (-0700)
Subject: Merge branch 'parisc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v5.15~8505
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=883c9ab9eb595f8542d01e55d29a346c8d96862e;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull parisc fixes and cleanups from Helge Deller:
 "Nothing exiting in this patchset, just

   - small cleanups of header files

   - default to 4 CPUs when building a SMP kernel

   - mark 16kB and 64kB page sizes broken

   - addition of the new io_pgetevents syscall"

* 'parisc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Build kernel without -ffunction-sections
  parisc: Reduce debug output in unwind code
  parisc: Wire up io_pgetevents syscall
  parisc: Default to 4 SMP CPUs
  parisc: Convert printk(KERN_LEVEL) to pr_lvl()
  parisc: Mark 16kB and 64kB page sizes BROKEN
  parisc: Drop struct sigaction from not exported header file
---

883c9ab9eb595f8542d01e55d29a346c8d96862e