Ingo Molnar b2c0931a07 Merge branch 'sched/urgent' into sched/core, to resolve conflicts ...

This commit in sched/urgent moved the cfs_rq_is_decayed() function:

  a7b359fc6a37: ("sched/fair: Correctly insert cfs_rq's to list on unthrottle")

and this fresh commit in sched/core modified it in the old location:

  9e077b52d86a: ("sched/pelt: Check that *_avg are null when *_sum are")

Merge the two variants.

Conflicts:
	kernel/sched/fair.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2021-06-18 11:31:25 +02:00

..

accounting

…

arch

tools headers cpufeatures: Sync with the kernel sources

2021-06-11 12:54:24 -03:00

bootconfig

tools/bootconfig: Fix a build error accroding to undefined fallthrough

2021-06-08 16:44:00 -04:00

bpf

bpftool: Add sock_release help info for cgroup attach/prog load command

2021-05-25 16:18:32 +02:00

build

tools build: Fix quiet cmd indentation

2021-05-17 12:10:03 +09:00

cgroup

tools/cgroup/slabinfo.py: updated to work on current kernel

2021-04-23 14:42:40 -07:00

debugging

tools: Fix a typo in kernel-chktaint

2021-04-08 11:41:22 -06:00

edid

…

firewire

…

firmware

…

gpio

tools: gpio-utils: fix various kernel-doc warnings

2021-03-26 14:56:19 +01:00

hv

…

iio

iio: event_monitor: Enable events before monitoring

2021-03-25 19:13:52 +00:00

include

Merge branch 'sched/urgent' into sched/core, to pick up fixes

2021-06-03 19:00:49 +02:00

io_uring

tools/io_uring: fix compile breakage

2020-09-21 07:50:58 -06:00

kvm/kvm_stat

tools/kvm_stat: Fix documentation typo

2021-05-07 06:06:22 -04:00

laptop

…

leds

…

lib

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

2021-05-11 16:05:56 -07:00

memory-model

doc: update rcu_dereference.rst reference

2021-04-06 14:45:04 +02:00

objtool

objtool: Only rewrite unconditional retpoline thunk calls

2021-06-11 08:53:06 +02:00

pci

…

pcmcia

…

perf

perf session: Correct buffer copying when peeking events

2021-06-11 12:54:24 -03:00

power

Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2021-05-05 12:24:29 -07:00

scripts

tools build: Fix quiet cmd indentation

2021-05-17 12:10:03 +09:00

spi

spi: tools: make a symbolic link to the header file spi.h

2021-04-22 16:30:39 +01:00

testing

Merge branch 'sched/urgent' into sched/core, to resolve conflicts

2021-06-18 11:31:25 +02:00

thermal/tmon

tools: do not include scripts/Kbuild.include

2021-04-25 05:26:13 +09:00

time

…

tracing

tools/latency-collector: Remove unneeded semicolon

2021-03-18 12:58:26 -04:00

usb

treewide: remove editor modelines and cruft

2021-05-07 00:26:34 -07:00

virtio

tools/virtio: add barrier for aarch64

2020-12-18 16:14:30 -05:00

vm

mm: Add PG_arch_2 page flag

2020-09-04 12:46:06 +01:00

wmi

…

Makefile

tracing/tools: Add the latency-collector to tools directory

2021-02-12 11:52:59 -05:00