Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jan 2020 20:00:29 +0000 (12:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jan 2020 20:00:29 +0000 (12:00 -0800)
commit4244057c3da1dde07c0f338ea32fed6e79d6a657
tree1559c86923f4bffea50be23f0a58958ba0cfbe96
parent6b90e71a472be131186276a5fd19d319fa2125d9
parente79f15a4598c1f3f3f7f3319ca308c63c91fdaf2
Merge branch 'x86-cache-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 resource control updates from Ingo Molnar:
 "The main change in this tree is the extension of the resctrl procfs
  ABI with a new file that helps tooling to navigate from tasks back to
  resctrl groups: /proc/{pid}/cpu_resctrl_groups.

  Also fix static key usage for certain feature combinations and
  simplify the task exit resctrl case"

* 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Add task resctrl information display
  x86/resctrl: Check monitoring static key in the MBM overflow handler
  x86/resctrl: Do not reconfigure exiting tasks
arch/x86/Kconfig
arch/x86/kernel/cpu/resctrl/rdtgroup.c
fs/proc/base.c