From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Jun 2019 21:52:31 +0000 (+0800)
Subject: Merge branch 'parisc-5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v5.2-rc7~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=249155c20f9b0754bc1b932a33344cfb4e0c2101;p=thirdparty%2Fkernel%2Flinux.git

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

Pull parisc fix from Helge Deller:
 "Add missing PCREL64 relocation in module loader to fix module load
  errors when the static branch and JUMP_LABEL feature is enabled on
  a 64-bit kernel"

* 'parisc-5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix module loading error with JUMP_LABEL feature
---

249155c20f9b0754bc1b932a33344cfb4e0c2101