From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Aug 2023 16:00:31 +0000 (-0700)
Subject: Merge tag 'cpuidle-psci-v6.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6.17~4232
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a5482c284e09423face5a7ef571b85185f43a48;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'cpuidle-psci-v6.5-rc5' of git://git./linux/kernel/git/ulfh/linux-pm

Pull cpuidle psci fixes from Ulf Hansson:
 "A couple of cpuidle-psci fixes. Usually, this is managed by arm-soc
  maintainers or Rafael, although due to a busy period I have stepped in
  to help out:

   - Fix the error path to prevent reverting from OSI back to PC mode"

* tag 'cpuidle-psci-v6.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm:
  cpuidle: psci: Move enabling OSI mode after power domains creation
  cpuidle: dt_idle_genpd: Add helper function to remove genpd topology
---

2a5482c284e09423face5a7ef571b85185f43a48