Tejun Heo 0b1777f0fa Merge branch 'tip/sched/core' into sched_ext/for-6.12 ... Pull in tip/sched/core to resolve two merge conflicts: - 96fd6c65ef ("sched: Factor out update_other_load_avgs() from __update_blocked_others()") 5d871a6399 ("sched/fair: Move effective_cpu_util() and effective_cpu_util() in fair.c") A simple context conflict. The former added __update_blocked_others() in the same #ifdef CONFIG_SMP block that effective_cpu_util() and sched_cpu_util() are in and the latter moved those functions to fair.c. This makes __update_blocked_others() more out of place. Will follow up with a patch to relocate. - 96fd6c65ef ("sched: Factor out update_other_load_avgs() from __update_blocked_others()") 84d265281d ("sched/pelt: Use rq_clock_task() for hw_pressure") The former factored out the body of __update_blocked_others() into update_other_load_avgs(). The latter changed how update_hw_load_avg() is called in the body. Resolved by applying the change to update_other_load_avgs() instead. Signed-off-by: Tejun Heo <tj@kernel.org>		2024-09-11 08:43:26 -10:00
..
acpi	ACPICA: Add a depth argument to acpi_execute_reg_methods()	2024-08-13 13:44:57 +02:00
asm-generic	Merge branch 'bpf/master' into for-6.12	2024-09-04 11:41:32 -10:00
clocksource
crypto
drm	drm/buddy: Add start address support to trim function	2024-08-07 18:19:00 -04:00
dt-bindings	I3C for 6.11	2024-07-27 10:53:06 -07:00
keys
kunit
kvm
linux	sched_ext: Compact struct bpf_iter_scx_dsq_kern	2024-09-09 13:42:47 -10:00
math-emu
media
memory
misc
net	vsock: fix recursive ->recvmsg calls	2024-08-15 12:07:04 +02:00
pcmcia
ras
rdma
rv
scsi	Driver core changes for 6.11-rc1	2024-07-25 10:42:22 -07:00
soc	sound updates for 6.11-rc1	2024-07-19 12:39:34 -07:00
sound	ASoC: Fixes for v6.11	2024-08-09 09:58:07 +02:00
target
trace	Merge branch 'bpf/master' into for-6.12	2024-09-04 11:41:32 -10:00
uapi	Merge branch 'tip/sched/core' into sched_ext/for-6.12	2024-09-11 08:43:26 -10:00
ufs	scsi: ufs: core: Check LSDBS cap when !mcq	2024-07-15 22:51:06 -04:00
vdso	Random number generator updates for Linux 6.11-rc1.	2024-07-24 10:29:50 -07:00
video
xen	Driver core changes for 6.11-rc1	2024-07-25 10:42:22 -07:00