]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e41216 6ef8eb5)
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)
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()


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.