Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'x86_urgent_for_v6.10_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Borislav Petkov:
- An ARM-relevant fix to not free default RMIDs of a resource control
group
- A randconfig build fix for the VMware virtual GPU driver
* tag 'x86_urgent_for_v6.10_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/resctrl: Don't try to free nonexistent RMIDs
drm/vmwgfx: Fix missing HYPERVISOR_GUEST dependency
+3
-2
+2
-1
arch/x86/kernel/cpu/resctrl/monitor.c
+2
-1
arch/x86/kernel/cpu/resctrl/monitor.c
···
519
519
* allows architectures that ignore the closid parameter to avoid an
520
520
* unnecessary check.
521
521
*/
522
-
if (idx == resctrl_arch_rmid_idx_encode(RESCTRL_RESERVED_CLOSID,
522
+
if (!resctrl_arch_mon_capable() ||
523
+
idx == resctrl_arch_rmid_idx_encode(RESCTRL_RESERVED_CLOSID,
523
524
RESCTRL_RESERVED_RMID))
524
525
return;
525
526
+1
-1
drivers/gpu/drm/vmwgfx/Kconfig
+1
-1
drivers/gpu/drm/vmwgfx/Kconfig