Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner: "The itimer removal one is not strictly a fix, but I really wanted to avoid a rebase of the urgent ones." * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: Revert "clocksource: Load the ACPI PM clocksource asynchronously" clockevents: tTack broadcast device mode change in tick_broadcast_switch_to_oneshot() itimer: Use printk_once instead of WARN_ONCE nohz: Fix stale jiffies update in tick_nohz_restart() tick: Document TICK_ONESHOT config option proc: stats: Use arch_idle_time for idle and iowait times if available itimer: Schedule silent NULL pointer fixup in setitimer() for removal
Showing
- Documentation/feature-removal-schedule.txt 8 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- drivers/clocksource/acpi_pm.c 8 additions, 16 deletionsdrivers/clocksource/acpi_pm.c
- fs/proc/stat.c 28 additions, 6 deletionsfs/proc/stat.c
- kernel/itimer.c 6 additions, 2 deletionskernel/itimer.c
- kernel/time/Kconfig 4 additions, 0 deletionskernel/time/Kconfig
- kernel/time/tick-broadcast.c 3 additions, 1 deletionkernel/time/tick-broadcast.c
- kernel/time/tick-sched.c 2 additions, 2 deletionskernel/time/tick-sched.c
Loading
Please register or sign in to comment