Ingo Molnar f6472b1793 Merge tag 'v7.0-rc4' into timers/core, to resolve conflict ...

Resolve conflict between this change in the upstream kernel:

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

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

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

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

2026-03-21 08:02:36 +01:00

..

.kunitconfig

time/kunit: Add .kunitconfig

2026-02-24 08:41:51 +01:00

alarmtimer.c

time: Fix spelling mistakes in comments

2025-09-21 10:02:02 +02:00

clockevents.c

clockevents: Provide support for clocksource coupled comparators

2026-02-27 16:40:08 +01:00

clocksource-wdtest.c

clocksource: Rewrite watchdog code completely

2026-03-20 13:36:32 +01:00

clocksource.c

clocksource: Rewrite watchdog code completely

2026-03-20 13:36:32 +01:00

hrtimer.c

hrtimer: Add a helper to retrieve a hrtimer from its timerqueue node

2026-03-12 12:15:56 +01:00

itimer.c

timers/itimer: Avoid direct access to hrtimer clockbase

2025-09-09 12:27:17 +02:00

jiffies.c

Merge tag 'v7.0-rc4' into timers/core, to resolve conflict

2026-03-21 08:02:36 +01:00

Kconfig

clocksource: Rewrite watchdog code completely

2026-03-20 13:36:32 +01:00

Makefile

time: Build generic update_vsyscall() only with generic time vDSO

2025-09-04 11:23:50 +02:00

namespace.c

treewide: Replace kmalloc with kmalloc_obj for non-scalar types

2026-02-21 01:02:28 -08:00

ntp_internal.h

ntp: Rename __do_adjtimex() to ntp_adjtimex()

2025-06-19 14:28:23 +02:00

ntp.c

ntp: Use ktime_get_ntp_seconds()

2025-06-19 14:28:24 +02:00

posix-clock.c

Convert 'alloc_obj' family to use the new default GFP_KERNEL argument

2026-02-21 17:09:51 -08:00

posix-cpu-timers.c

hrtimer: Store time as ktime_t in restart block

2025-11-14 16:31:19 +01:00

posix-stubs.c

posix-timers: Get rid of [COMPAT_]SYS_NI() uses

2023-12-20 21:30:27 -08:00

posix-timers.c

compiler-context-analysis: Remove __cond_lock() function-like helper

2026-01-05 16:43:33 +01:00

posix-timers.h

timekeeping: Add minimal posix-timers support for auxiliary clocks

2025-06-27 20:13:12 +02:00

sched_clock.c

time/sched_clock: Use ACCESS_PRIVATE() to evaluate hrtimer::function

2026-01-13 18:08:57 +01:00

sleep_timeout.c

treewide, timers: Rename from_timer() to timer_container_of()

2025-06-08 09:07:37 +02:00

test_udelay.c

time: Add MODULE_DESCRIPTION() to time test modules

2024-06-03 11:18:50 +02:00

tick-broadcast-hrtimer.c

clockevents: Remove redundant CLOCK_EVT_FEAT_KTIME

2026-02-27 16:40:06 +01:00

tick-broadcast.c

treewide: Update email address

2026-01-11 06:09:11 -10:00

tick-common.c

treewide: Update email address

2026-01-11 06:09:11 -10:00

tick-internal.h

cpufreq: ondemand: Simplify idle cputime granularity test

2026-01-28 22:24:58 +01:00

tick-legacy.c

timekeeping: remove xtime_update

2020-10-30 21:57:07 +01:00

tick-oneshot.c

treewide: Update email address

2026-01-11 06:09:11 -10:00

tick-sched.c

tick/sched: Avoid hrtimer_cancel/start() sequence

2026-02-27 16:40:06 +01:00

tick-sched.h

tick/sched: Fix struct tick_sched doc warnings

2024-04-01 10:36:35 +02:00

time_test.c

time/kunit: Document handling of negative years of is_leap()

2026-02-02 12:37:54 +01:00

time.c

time/jiffies: Mark jiffies_64_to_clock_t() notrace

2026-03-11 10:33:12 +01:00

timeconst.bc

time: Add SPDX license identifiers

2018-11-23 11:51:20 +01:00

timeconv.c

time: Improve performance of time64_to_tm()

2021-06-24 11:51:59 +02:00

timecounter.c

time/timecounter: Inline timecounter_cyc2time()

2025-12-15 20:16:49 +01:00

timekeeping_debug.c

timekeeping: Add percpu counter for tracking floor swap events

2024-10-10 10:20:46 +02:00

timekeeping_internal.h

timekeeping: Provide ktime_get_ntp_seconds()

2025-06-19 14:28:23 +02:00

timekeeping.c

Merge tag 'v7.0-rc4' into timers/core, to resolve conflict

2026-03-21 08:02:36 +01:00

timekeeping.h

timekeeping: Provide infrastructure for coupled clockevents

2026-02-27 16:40:08 +01:00

timer_list.c

timer_list: Print offset as signed integer

2026-03-12 12:15:54 +01:00

timer_migration.c

Merge tag 'cgroup-for-7.0-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

2026-03-03 14:25:18 -08:00

timer_migration.h

timers/migration: Rename 'online' bit to 'available'

2025-11-20 20:17:31 +01:00

timer.c

cpufreq: ondemand: Simplify idle cputime granularity test

2026-01-28 22:24:58 +01:00

vsyscall.c

vdso/vsyscall: Avoid slow division loop in auxiliary clock update

2025-09-03 11:55:11 +02:00