Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer core updates from Thomas Gleixner: "The time(r) departement provides: - more infrastructure work on the year 2038 issue - a few fixes in the Armada SoC timers - the usual pile of fixlets and improvements" * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource: armada-370-xp: Use the reference clock on A375 SoC watchdog: orion: Use the reference clock on Armada 375 SoC clocksource: armada-370-xp: Add missing clock enable time: Fix sign bug in NTP mult overflow warning time: Remove timekeeping_inject_sleeptime() rtc: Update suspend/resume timing to use 64bit time rtc/lib: Provide y2038 safe rtc_tm_to_time()/rtc_time_to_tm() replacement time: Fixup comments to reflect usage of timespec64 time: Expose get_monotonic_coarse64() for in-kernel uses time: Expose getrawmonotonic64 for in-kernel uses time: Provide y2038 safe mktime() replacement time: Provide y2038 safe timekeeping_inject_sleeptime() replacement time: Provide y2038 safe do_settimeofday() replacement time: Complete NTP adjustment threshold judging conditions time: Avoid possible NTP adjustment mult overflow. time: Rename udelay_test.c to test_udelay.c clocksource: sirf: Remove hard-coded clock rate
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt 6 additions, 3 deletions...devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
- Documentation/devicetree/bindings/watchdog/marvel.txt 13 additions, 0 deletionsDocumentation/devicetree/bindings/watchdog/marvel.txt
- drivers/clocksource/time-armada-370-xp.c 30 additions, 0 deletionsdrivers/clocksource/time-armada-370-xp.c
- drivers/clocksource/timer-marco.c 9 additions, 14 deletionsdrivers/clocksource/timer-marco.c
- drivers/rtc/class.c 15 additions, 15 deletionsdrivers/rtc/class.c
- drivers/rtc/rtc-lib.c 20 additions, 18 deletionsdrivers/rtc/rtc-lib.c
- drivers/watchdog/orion_wdt.c 41 additions, 1 deletiondrivers/watchdog/orion_wdt.c
- include/linux/rtc.h 19 additions, 2 deletionsinclude/linux/rtc.h
- include/linux/time.h 14 additions, 3 deletionsinclude/linux/time.h
- include/linux/timekeeping.h 45 additions, 4 deletionsinclude/linux/timekeeping.h
- kernel/time/Makefile 1 addition, 1 deletionkernel/time/Makefile
- kernel/time/test_udelay.c 0 additions, 0 deletionskernel/time/test_udelay.c
- kernel/time/time.c 8 additions, 12 deletionskernel/time/time.c
- kernel/time/timekeeping.c 32 additions, 27 deletionskernel/time/timekeeping.c
Please register or sign in to comment