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

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

diff --cc Documentation/x86/index.rst
Simple merge

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

diff --cc arch/x86/kernel/cpu/resctrl/internal.h
Simple merge

diff --cc arch/x86/kernel/cpu/resctrl/monitor.c
index a98519a,622073f..7ac3121
--- 1/arch/x86/kernel/cpu/resctrl/monitor.c
--- 2/arch/x86/kernel/cpu/resctrl/monitor.c
+++ b/arch/x86/kernel/cpu/resctrl/monitor.c
@@@ -279,7 -343,8 +343,7 @@@ static void mbm_bw_count(u32 rmid, stru
                return;
  
        chunks = mbm_overflow_count(m->prev_bw_msr, tval, rr->r->mbm_width);
-       cur_bw = (chunks * r->mon_scale) >> 20;
 -      m->chunks += chunks;
+       cur_bw = (get_corrected_mbm_count(rmid, chunks) * r->mon_scale) >> 20;
  
        if (m->delta_comp)
                m->delta_bw = abs(cur_bw - m->prev_bw);

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