From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Dec 2019 14:49:41 +0000 (-0800)
Subject: Merge branch 'parisc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6210469417fd967ec72dea56723593beefeecafb;p=linux.git

Merge branch 'parisc-5.5-2' of git://git./linux/kernel/git/deller/parisc-linux

Pul parisc fixes from Helge Deller:
 "Two build error fixes, one for the soft_offline_page() parameter
  change and one for a specific KEXEC/KEXEC_FILE configuration, as well
  as a compiler and a linker warning fix"

* 'parisc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix compiler warnings in debug_core.c
  parisc: soft_offline_page() now takes the pfn
  parisc: add missing __init annotation
  parisc: fix compilation when KEXEC=n and KEXEC_FILE=y
---

6210469417fd967ec72dea56723593beefeecafb