From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Nov 2019 22:16:25 +0000 (-0700)
Subject: Merge branch 'parisc-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v5.4-rc6~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31408fbe33d1d5e6209fa89fa5b45459197b8970;p=thirdparty%2Fkernel%2Flinux.git

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

Pull parisc fix from Helge Deller:
 "Fix a parisc kernel crash with ftrace functions when compiled without
  frame pointers"

* 'parisc-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: fix frame pointer in ftrace_regs_caller()
---

31408fbe33d1d5e6209fa89fa5b45459197b8970