From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Sep 2017 18:10:30 +0000 (-0700)
Subject: Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~10552
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f29139bf109d35967229b2caf4e6297c201cc690;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'x86-debug-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 debug updates from Ingo Molnar:
 "Various fixes to the NUMA emulation code"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/numa_emulation: Recalculate numa_nodes_parsed from emulated nodes
  x86/numa_emulation: Assign physnode_mask directly from numa_nodes_parsed
  x86/numa_emulation: Refine the calculation of max_emu_nid and dfl_phys_nid
---

f29139bf109d35967229b2caf4e6297c201cc690