summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-09 23:00:12 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-09 23:00:12 +0300
commit2fbc23c738350f1a47007da7ad92ae2e4ea63951 (patch)
tree88029f5be09244ef6ebd132486b6f1d2b8b6fa36 /MAINTAINERS
parentf06bed87d7cdfd51793cbb0111799f39ba75cfa3 (diff)
parentfebac332a819f0e764aa4da62757ba21d18c182b (diff)
downloadlinux-2fbc23c738350f1a47007da7ad92ae2e4ea63951.tar.xz
Merge tag 'timers-urgent-2020-02-09' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c74e4ea714a5..f74871a22c42 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13360,7 +13360,7 @@ S: Maintained
F: fs/timerfd.c
F: include/linux/timer*
F: include/linux/time_namespace.h
-F: kernel/time_namespace.c
+F: kernel/time/namespace.c
F: kernel/time/*timer*
POWER MANAGEMENT CORE