]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d8763f7 14248f5)
Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 21 Feb 2022 10:53:51 +0000 (11:53 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 21 Feb 2022 10:53:51 +0000 (11:53 +0100)
commit3f726c8152db040df3469f9ae00e133e4afef1fd
treebcedf2b959a843a18cf7ebcc9120a0dd1c4e234ftree | snapshot
parentd8763f7e4693be7826a71064bbc1ff61a419870dcommit | diff
parent14248f540c2a63979cc0b6d26ba6756218d81bafcommit | diff
Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts

New conflicts in sched/core due to the following upstream fixes:

  e8d2054edce3 ("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n")
  11cf6e80dcaf ("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>
MAINTAINERS diff1 | diff2 | blob | history
arch/arm64/Kconfig diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kvm/x86.c diff1 | diff2 | blob | history
include/linux/psi_types.h diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
kernel/cgroup/cpuset.c diff1 | diff2 | blob | history
kernel/rcu/tasks.h diff1 | diff2 | blob | history
kernel/sched/core.c diff1 | diff2 | blob | history
kernel/sched/fair.c diff1 | diff2 | blob | history
kernel/sched/psi.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.