From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jan 2020 20:00:29 +0000 (-0800)
Subject: Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4244057c3da1dde07c0f338ea32fed6e79d6a657;p=linux.git

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
---

4244057c3da1dde07c0f338ea32fed6e79d6a657
diff --cc fs/proc/base.c
index 5adc6390ac3a4,bbffd654bb0ec..915686772f0e5
--- a/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"