Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts
New conflicts in sched/core due to the following upstream fixes: 44585f7b ("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n") a06247c6 ("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>
Loading
Please register or sign in to comment