commit 8ba27ae36b416a1507e783dbee4bb521fd6bb519
author Linus Torvalds <torvalds@linux-foundation.org> Mon Dec 14 13:53:17 2020 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Dec 14 13:53:17 2020 -0800
tree c09d559f85d116e6614abde112bd6e6cd9e4c15a
parent 405f868f13daf7bae85e6fec143121c27d52cdb4
parent 19eb86a72df50adcf554f234469bb5b7209b7640

Merge tag 'x86_cache_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cache resource control updates from Borislav Petkov:

 - add logic to correct MBM total and local values fixing errata SKX99
   and BDF102 (Fenghua Yu)

 - cleanups

* tag 'x86_cache_for_v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Clean up unused function parameter in rmdir path
  x86/resctrl: Constify kernfs_ops
  x86/resctrl: Correct MBM total and local values
  Documentation/x86: Rename resctrl_ui.rst and add two errata to the file