]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge tag 'v7.0-rc4' into timers/core, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Sat, 21 Mar 2026 07:02:36 +0000 (08:02 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 21 Mar 2026 07:02:36 +0000 (08:02 +0100)
commitf6472b17933f9adb825e7c7da31f7b7b2edb1950
tree84cca5e27843ed65fd49e62352d0a1de582470be
parent763aacf86f1baefb134c70813aa8c72d1675d738
parentf338e77383789c0cae23ca3d48adcc5e9e137e3c
Merge tag 'v7.0-rc4' into timers/core, to resolve conflict

Resolve conflict between this change in the upstream kernel:

  4c652a47722f ("rseq: Mark rseq_arm_slice_extension_timer() __always_inline")

... and this pending change in timers/core:

  0e98eb14814e ("entry: Prepare for deferred hrtimer rearming")

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
arch/x86/kernel/apic/apic.c
include/linux/jiffies.h
include/linux/rseq_entry.h
kernel/sched/core.c
kernel/sched/fair.c
kernel/sched/sched.h
kernel/time/jiffies.c
kernel/time/timekeeping.c