Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/cpu/resctrl/rdtgroup.c
Simple merge

diff --cc fs/proc/base.c
index 5adc6390ac3a447a21e04ef8f3042e8953157a2d,bbffd654bb0ecb87fb6040e6fe7bb91bbf6a6943..915686772f0e56fcdcaca8e0ef0193af66b291a3
--- 1/fs/proc/base.c
--- 2/fs/proc/base.c
+++ b/fs/proc/base.c
@@@ -94,7 -94,7 +94,8 @@@
  #include <linux/sched/debug.h>
  #include <linux/sched/stat.h>
  #include <linux/posix-timers.h>
 +#include <linux/time_namespace.h>
+ #include <linux/resctrl.h>
  #include <trace/events/oom.h>
  #include "internal.h"
  #include "fd.h"