git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c88e40e d2ba3b1)
Merge branch 'parisc-5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Jun 2019 21:52:31 +0000 (05:52 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Jun 2019 21:52:31 +0000 (05:52 +0800)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.