Skip to content
Commit 6255b48a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@kernel.org>
parents 1b2d3451 cfb92440
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment