Ingo Molnar 6255b48aeb Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts ...

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>

2022-02-21 11:53:51 +01:00

..

accounting

delayacct: track delays from memory compact

2022-01-20 08:52:55 +02:00

arch

tools headers cpufeatures: Sync with the kernel sources

2022-02-01 12:21:47 -03:00

bootconfig

…

bpf

Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

2022-02-03 13:42:38 -08:00

build

…

cgroup

…

counter

…

debugging

…

edid

…

firewire

…

firmware

…

gpio

…

hv

…

iio

…

include

tools headers UAPI: Sync linux/perf_event.h with the kernel sources

2022-02-16 13:49:24 -03:00

io_uring

…

kvm/kvm_stat

…

laptop

…

leds

…

lib

libsubcmd: Fix use-after-free for realloc(..., 0)

2022-02-16 13:49:25 -03:00

memory-model

…

objtool

objtool: Fix truncated string warning

2022-01-24 10:09:06 -08:00

pci

…

pcmcia

…

perf

perf bpf: Defer freeing string after possible strlen() on it

2022-02-17 07:15:09 -03:00

power

Merge tag 'acpi-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2022-01-18 08:51:51 +02:00

rcu

…

scripts

tools: Ignore errors from `which' when searching a GCC toolchain

2022-02-01 23:04:12 +01:00

spi

…

testing

Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts

2022-02-21 11:53:51 +01:00

thermal/tmon

…

time

…

tracing

rtla: Fix segmentation fault when failing to enable -t

2022-02-08 11:23:09 -05:00

usb

…

virtio

…

vm

…

wmi

…

Makefile

…