James Morse (2): arm64: mpam: Add cpu_pm notifier to restore MPAM sysregs arm64: mpam: Restore the expected MPAM sysregs on cpuhp Zeng Heng (5): x86/resctrl: Add a handling path of default label in get_arch_mbm_state() fs/resctrl: Create l2 cache monitors fs/resctrl: Add l2 mount option to enable L2 msc arm64/mpam: Refuse cpu offline when L2 msc is enabled arm64/mpam: Refuse to enter powerdown state after L2 msc updated arch/arm64/kernel/cpufeature.c | 6 ++ arch/arm64/kernel/mpam.c | 41 ++++++++++++++ arch/x86/include/asm/resctrl.h | 2 + arch/x86/kernel/cpu/resctrl/monitor.c | 2 + drivers/platform/mpam/mpam_devices.c | 7 ++- drivers/platform/mpam/mpam_internal.h | 2 + drivers/platform/mpam/mpam_resctrl.c | 79 +++++++++++++++++++++++++-- fs/resctrl/ctrlmondata.c | 6 ++ fs/resctrl/internal.h | 2 +- fs/resctrl/monitor.c | 14 +++++ fs/resctrl/rdtgroup.c | 33 ++++++++++- include/linux/arm_mpam.h | 2 + include/linux/resctrl.h | 5 ++ include/linux/resctrl_types.h | 10 ++++ 14 files changed, 200 insertions(+), 11 deletions(-) -- 2.25.1