From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Apr 2019 23:36:45 +0000 (-1000)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~4981
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=2f9e10acfa1243a7d0ad323873f4a193144a25c3;p=linux.git

Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull arm64 fix from Catalin Marinas:
 "Fix unwind_frame() in the context of pseudo NMI"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: fix wrong check of on_sdei_stack in nmi context
---

2f9e10acfa1243a7d0ad323873f4a193144a25c3