From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 May 2018 04:31:19 +0000 (-1000)
Subject: Merge branch 'parisc-4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v4.17-rc4~24
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bb609316d406c6e4dc29e0219d40e70837f70f8a;p=nvme.git

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

Pull parisc fixes from Helge Deller:
 "Fix two section mismatches, convert to read_persistent_clock64(), add
  further documentation regarding the HPMC crash handler and make
  bzImage the default build target"

* 'parisc-4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix section mismatches
  parisc: drivers.c: Fix section mismatches
  parisc: time: Convert read_persistent_clock() to read_persistent_clock64()
  parisc: Document rules regarding checksum of HPMC handler
  parisc: Make bzImage default build target
---

bb609316d406c6e4dc29e0219d40e70837f70f8a