From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Apr 2018 00:07:04 +0000 (-0700)
Subject: Merge branch 'parisc-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v4.17-rc1~31
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=681857ef0de16a61cf040464cd4a54ea626a2d53;p=users%2Fhch%2Fmisc.git

Merge branch 'parisc-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc updates from Helge Deller:

 - fix panic when halting system via "shutdown -h now"

 - drop own coding in favour of generic CONFIG_COMPAT_BINFMT_ELF
   implementation

 - add FPE_CONDTRAP constant: last outstanding parisc-specific cleanup
   for Eric Biedermans siginfo patches

 - move some functions to .init and some to .text.hot linker sections

* 'parisc-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Prevent panic at system halt
  parisc: Switch to generic COMPAT_BINFMT_ELF
  parisc: Move cache flush functions into .text.hot section
  parisc/signal: Add FPE_CONDTRAP for conditional trap handling
---

681857ef0de16a61cf040464cd4a54ea626a2d53