From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Oct 2018 22:02:40 +0000 (-0700)
Subject: Merge branch 'parisc-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v4.20-rc1~67
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c38239b4be1ac7e4bcf5bbd971353bae51525b8f;p=nvme.git

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

Pull parisc updates from Helge Deller:
 "Three small patches:

   - A boot fix for A500 machines, crash was caused by the new
     alternative patching code from this merge window (Dave)

   - Change __kernel_suseconds_t to match glibc on 64-bit parisc (Arnd)

   - Use constants instead of hard-coded numbers (me)"

* 'parisc-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix A500 boot crash
  parisc: Use LINUX_GATEWAY_SPACE constant in entry.S
  parisc64: change __kernel_suseconds_t to match glibc
---

c38239b4be1ac7e4bcf5bbd971353bae51525b8f