Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 8d338df

Browse files
committed
Merge tag 'timers_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timers update from Borislav Petkov: - Volunteer in Anna-Maria and Frederic as timers co-maintainers so that tglx can relax more :-P * tag 'timers_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: MAINTAINERS: Add co-maintainers for time[rs]
2 parents 8d7e768 + 1fed2f1 commit 8d338df

File tree

1 file changed

+27
-8
lines changed

1 file changed

+27
-8
lines changed

MAINTAINERS

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9651,17 +9651,23 @@ L: linux-input@vger.kernel.org
96519651
S: Maintained
96529652
F: drivers/hid/hid-logitech-hidpp.c
96539653

9654-
HIGH-RESOLUTION TIMERS, CLOCKEVENTS
9654+
HIGH-RESOLUTION TIMERS, TIMER WHEEL, CLOCKEVENTS
9655+
M: Anna-Maria Behnsen <anna-maria@linutronix.de>
9656+
M: Frederic Weisbecker <frederic@kernel.org>
96559657
M: Thomas Gleixner <tglx@linutronix.de>
96569658
L: linux-kernel@vger.kernel.org
96579659
S: Maintained
96589660
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
96599661
F: Documentation/timers/
96609662
F: include/linux/clockchips.h
96619663
F: include/linux/hrtimer.h
9664+
F: include/linux/timer.h
96629665
F: kernel/time/clockevents.c
96639666
F: kernel/time/hrtimer.c
9664-
F: kernel/time/timer_*.c
9667+
F: kernel/time/timer.c
9668+
F: kernel/time/timer_list.c
9669+
F: kernel/time/timer_migration.*
9670+
F: tools/testing/selftests/timers/
96659671

96669672
HIGH-SPEED SCC DRIVER FOR AX.25
96679673
L: linux-hams@vger.kernel.org
@@ -15626,9 +15632,10 @@ F: drivers/misc/nsm.c
1562615632
F: include/uapi/linux/nsm.h
1562715633

1562815634
NOHZ, DYNTICKS SUPPORT
15635+
M: Anna-Maria Behnsen <anna-maria@linutronix.de>
1562915636
M: Frederic Weisbecker <frederic@kernel.org>
15630-
M: Thomas Gleixner <tglx@linutronix.de>
1563115637
M: Ingo Molnar <mingo@kernel.org>
15638+
M: Thomas Gleixner <tglx@linutronix.de>
1563215639
L: linux-kernel@vger.kernel.org
1563315640
S: Maintained
1563415641
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/nohz
@@ -17589,15 +17596,20 @@ F: drivers/pnp/
1758917596
F: include/linux/pnp.h
1759017597

1759117598
POSIX CLOCKS and TIMERS
17599+
M: Anna-Maria Behnsen <anna-maria@linutronix.de>
17600+
M: Frederic Weisbecker <frederic@kernel.org>
1759217601
M: Thomas Gleixner <tglx@linutronix.de>
1759317602
L: linux-kernel@vger.kernel.org
1759417603
S: Maintained
1759517604
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
1759617605
F: fs/timerfd.c
1759717606
F: include/linux/time_namespace.h
17598-
F: include/linux/timer*
17607+
F: include/linux/timerfd.h
17608+
F: include/uapi/linux/time.h
17609+
F: include/uapi/linux/timerfd.h
1759917610
F: include/trace/events/timer*
17600-
F: kernel/time/*timer*
17611+
F: kernel/time/itimer.c
17612+
F: kernel/time/posix-*
1760117613
F: kernel/time/namespace.c
1760217614

1760317615
POWER MANAGEMENT CORE
@@ -22279,13 +22291,20 @@ S: Supported
2227922291
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
2228022292
F: include/linux/clocksource.h
2228122293
F: include/linux/time.h
22294+
F: include/linux/timekeeper_internal.h
22295+
F: include/linux/timekeeping.h
2228222296
F: include/linux/timex.h
2228322297
F: include/uapi/linux/time.h
2228422298
F: include/uapi/linux/timex.h
2228522299
F: kernel/time/alarmtimer.c
22286-
F: kernel/time/clocksource.c
22287-
F: kernel/time/ntp.c
22288-
F: kernel/time/time*.c
22300+
F: kernel/time/clocksource*
22301+
F: kernel/time/ntp*
22302+
F: kernel/time/time.c
22303+
F: kernel/time/timeconst.bc
22304+
F: kernel/time/timeconv.c
22305+
F: kernel/time/timecounter.c
22306+
F: kernel/time/timekeeping*
22307+
F: kernel/time/time_test.c
2228922308
F: tools/testing/selftests/timers/
2229022309

2229122310
TIPC NETWORK LAYER

0 commit comments

Comments
 (0)