projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1b2d345 cfb9244)
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)
commit6255b48aebfd4dff375e97fc8b075a235848db0b
treebcedf2b959a843a18cf7ebcc9120a0dd1c4e234ftree | snapshot
parent1b2d3451ee50a0968cb9933f726e50b368ba5073commit | diff
parentcfb92440ee71adcc2105b0890bb01ac3cddb8507commit | diff
Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts

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

  44585f7bc0cb ("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n")
  a06247c6804f ("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
ep93xx device tree rework repo: git://git.maquefel.me/linux.git