Merge branch 'for-next/cpuidle' into for-next/core
authorWill Deacon <will@kernel.org>
Thu, 24 Jun 2021 12:36:39 +0000 (13:36 +0100)
committerWill Deacon <will@kernel.org>
Thu, 24 Jun 2021 12:36:39 +0000 (13:36 +0100)
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

1  2 
arch/arm64/kernel/process.c

Simple merge