Merge branch 'timers/core' into sched/hrtimers

Merge sched/core and timers/core so we can apply the sched balancing patch queue, which depends on both.
2026-09-28 19:20:30 +00:00 · 2015-06-19 00:17:47 +02:00 · 2015-06-19 00:17:47 +02:00 · 624bbdfac9
commit 624bbdfac9
parent 6f9aad0bc3 887d9dc989
74 changed files with 2057 additions and 1324 deletions
--- a/Documentation/devicetree/bindings/arm/armv7m_systick.txt
+++ b/Documentation/devicetree/bindings/arm/armv7m_systick.txt
--- a/Documentation/devicetree/bindings/timer/nxp,lpc3220-timer.txt
+++ b/Documentation/devicetree/bindings/timer/nxp,lpc3220-timer.txt
--- a/Documentation/devicetree/bindings/timer/st,stm32-timer.txt
+++ b/Documentation/devicetree/bindings/timer/st,stm32-timer.txt
--- a/34
+++ b/34
--- a/arch/s390/include/asm/timex.h
+++ b/arch/s390/include/asm/timex.h
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
--- a/drivers/clocksource/armv7m_systick.c
+++ b/drivers/clocksource/armv7m_systick.c
--- a/drivers/clocksource/asm9260_timer.c
+++ b/drivers/clocksource/asm9260_timer.c
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
--- a/drivers/clocksource/qcom-timer.c
+++ b/drivers/clocksource/qcom-timer.c
--- a/drivers/clocksource/time-lpc32xx.c
+++ b/drivers/clocksource/time-lpc32xx.c
--- a/drivers/clocksource/timer-integrator-ap.c
+++ b/drivers/clocksource/timer-integrator-ap.c
--- a/drivers/clocksource/timer-stm32.c
+++ b/drivers/clocksource/timer-stm32.c
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
--- a/drivers/power/reset/ltc2952-poweroff.c
+++ b/drivers/power/reset/ltc2952-poweroff.c
--- a/fs/dcache.c
+++ b/fs/dcache.c
--- a/include/linux/alarmtimer.h
+++ b/include/linux/alarmtimer.h
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
--- a/include/linux/time64.h
+++ b/include/linux/time64.h
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
--- a/include/linux/timerqueue.h
+++ b/include/linux/timerqueue.h
--- a/include/trace/events/timer.h
+++ b/include/trace/events/timer.h
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
--- a/kernel/futex.c
+++ b/kernel/futex.c
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
--- a/kernel/time/ntp_internal.h
+++ b/kernel/time/ntp_internal.h
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
--- a/kernel/time/tick-broadcast-hrtimer.c
+++ b/kernel/time/tick-broadcast-hrtimer.c
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
--- a/kernel/time/tick-oneshot.c
+++ b/kernel/time/tick-oneshot.c
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
--- a/kernel/time/tick-sched.h
+++ b/kernel/time/tick-sched.h
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
--- a/kernel/time/timeconst.bc
+++ b/kernel/time/timeconst.bc
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
--- a/kernel/time/timekeeping.h
+++ b/kernel/time/timekeeping.h
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
--- a/lib/timerqueue.c
+++ b/lib/timerqueue.c
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
--- a/sound/core/hrtimer.c
+++ b/sound/core/hrtimer.c
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
--- a/tools/testing/selftests/timers/leap-a-day.c
+++ b/tools/testing/selftests/timers/leap-a-day.c