From: Will Deacon <will@kernel.org>
Date: Thu, 24 Jun 2021 12:36:39 +0000 (+0100)
Subject: Merge branch 'for-next/cpuidle' into for-next/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eea3e2dec4c856677333fee7e8d56547cbd99121;p=linux.git

Merge branch 'for-next/cpuidle' into for-next/core

Fix resume from idle when pNMI is being used.

* for-next/cpuidle:
  arm64: suspend: Use cpuidle context helpers in cpu_suspend()
  PSCI: Use cpuidle context helpers in psci_cpu_suspend_enter()
  arm64: Convert cpu_do_idle() to using cpuidle context helpers
  arm64: Add cpuidle context save/restore helpers
---

eea3e2dec4c856677333fee7e8d56547cbd99121