Merge tag 'smp_urgent_for_v6.10_rc6' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Jun 2024 15:41:42 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Jun 2024 15:41:42 +0000 (08:41 -0700)
commit3ffea9a7a6f71b5fb6f997d7b2ad95634dae57ab
treeb690a7f438b88c6ef1228925229067436250a8e3
parent4e41216009143efa48dcf11bc096d4f8ee1c0f12
parent6ef8eb5125722c241fd60d7b0c872d5c2e5dd4ca
Merge tag 'smp_urgent_for_v6.10_rc6' of git://git./linux/kernel/git/tip/tip

Pull smp fixes from Borislav Petkov:

 - Fix "nosmp" and "maxcpus=0" after the parallel CPU bringup work went
   in and broke them

 - Make sure CPU hotplug dynamic prepare states are actually executed

* tag 'smp_urgent_for_v6.10_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu: Fix broken cmdline "nosmp" and "maxcpus=0"
  cpu/hotplug: Fix dynstate assignment in __cpuhp_setup_state_cpuslocked()