Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Apr 2019 23:36:45 +0000 (13:36 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Apr 2019 23:36:45 +0000 (13:36 -1000)
commit2f9e10acfa1243a7d0ad323873f4a193144a25c3
treea0a4f36b9c4d78258c7b7778f6f09bf27d9bb248
parent970b766cfd3f3cb7275bf51144b1678c547882fc
parent1c41860864c8ae0387ef7d44f0000e99cbb2e06d
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