From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Feb 2020 20:00:12 +0000 (-0800)
Subject: Merge tag 'timers-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2fbc23c738350f1a47007da7ad92ae2e4ea63951;p=linux.git

Merge tag 'timers-urgent-2020-02-09' of git://git./linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "Two small fixes for the time(r) subsystem:

   - Handle a subtle race between the clocksource watchdog and a
     concurrent clocksource watchdog stop/start sequence correctly to
     prevent a timer double add bug.

   - Fix the file path for the core time namespace file"

* tag 'timers-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: Prevent double add_timer_on() for watchdog_timer
  MAINTAINERS: Correct path to time namespace source file
---

2fbc23c738350f1a47007da7ad92ae2e4ea63951