Merge branch 'x86-topology-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 May 2019 23:33:06 +0000 (16:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 May 2019 23:33:06 +0000 (16:33 -0700)
commit948a64995aca6820abefd17f1a4258f5835c5ad9
tree4759a88059334793d2799655febbce312ee0f393
parentdb10ad041b318a07985363e243742a07f4b0f44b
parent8fea0f59e97df3b9b8d2a76af54f633f4586751b
Merge branch 'x86-topology-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 topology updates from Ingo Molnar:
 "Two main changes: preparatory changes for Intel multi-die topology
  support, plus a syslog message tweak"

* 'x86-topology-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/topology: Make DEBUG_HOTPLUG_CPU0 pr_info() more descriptive
  x86/smpboot: Rename match_die() to match_pkg()
  topology: Simplify cputopology.txt formatting and wording
  x86/topology: Fix documentation typo
arch/x86/kernel/smpboot.c