From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 Jun 2024 15:41:42 +0000 (-0700)
Subject: Merge tag 'smp_urgent_for_v6.10_rc6' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: nvme-6.11-2024-08-08~256
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3ffea9a7a6f71b5fb6f997d7b2ad95634dae57ab;p=nvme.git

Merge tag 'smp_urgent_for_v6.10_rc6' of git://git.kernel.org/pub/scm/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()
---

3ffea9a7a6f71b5fb6f997d7b2ad95634dae57ab