From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Oct 2019 11:04:22 +0000 (-0400)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~5235
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b776b54bca8c6f3b3a37f89bd80863b688bd8dd;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'timers-urgent-for-linus' of git://git./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
---

2b776b54bca8c6f3b3a37f89bd80863b688bd8dd