tree 364b2cb3d18b156c1a008891beae951353d44d08
parent a8a31fdccabb244dd788090c6974784401f7c5a8
parent 7f2cbcbcafbca5360efbd175b3320852b8f7c637
author Linus Torvalds <torvalds@linux-foundation.org> 1572174262 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1572174262 -0400

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "A small set of fixes for time(keeping):

   - Add a missing include to prevent compiler warnings.

   - Make the VDSO implementation of clock_getres() POSIX compliant
     again. A recent change dropped the NULL pointer guard which is
     required as NULL is a valid pointer value for this function.

   - Fix two function documentation typos"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  posix-cpu-timers: Fix two trivial comments
  timers/sched_clock: Include local timekeeping.h for missing declarations
  lib/vdso: Make clock_getres() POSIX compliant again