mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-28 11:24:07 -05:00
New conflicts in sched/core due to the following upstream fixes:44585f7bc0("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n")a06247c680("psi: Fix uaf issue when psi trigger is destroyed while being polled") Conflicts: include/linux/psi_types.h kernel/sched/psi.c Signed-off-by: Ingo Molnar <mingo@kernel.org>