diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 11:59:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 11:59:46 -0500 |
commit | ab5318788c6725b6d5c95aff28e63af4c35a0e2c (patch) | |
tree | fb4a81d66ed06828948e3272ebe15088d405ec1e /MAINTAINERS | |
parent | 14164b46fc994bcf82963ace00372cf808a31af1 (diff) | |
parent | 270750dbc18a71b23d660df110e433ff9616a2d4 (diff) |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core debug changes from Ingo Molnar:
"This contains mostly kernel debugging related updates:
- make hung_task detection more configurable to distros
- add final bits for x86 UV NMI debugging, with related KGDB changes
- update the mailing-list of MAINTAINERS entries I'm involved with"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hung_task: Display every hung task warning
sysctl: Add neg_one as a standard constraint
x86/uv/nmi, kgdb/kdb: Fix UV NMI handler when KDB not configured
x86/uv/nmi: Fix Sparse warnings
kgdb/kdb: Fix no KDB config problem
MAINTAINERS: Restore "L: linux-kernel@vger.kernel.org" entries
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5f840aeab64d..6fb8759f49de 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2222,6 +2222,7 @@ F: include/linux/clk.h | |||
2222 | CLOCKSOURCE, CLOCKEVENT DRIVERS | 2222 | CLOCKSOURCE, CLOCKEVENT DRIVERS |
2223 | M: Daniel Lezcano <daniel.lezcano@linaro.org> | 2223 | M: Daniel Lezcano <daniel.lezcano@linaro.org> |
2224 | M: Thomas Gleixner <tglx@linutronix.de> | 2224 | M: Thomas Gleixner <tglx@linutronix.de> |
2225 | L: linux-kernel@vger.kernel.org | ||
2225 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core | 2226 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core |
2226 | S: Supported | 2227 | S: Supported |
2227 | F: drivers/clocksource | 2228 | F: drivers/clocksource |
@@ -4023,6 +4024,7 @@ F: include/uapi/linux/hid* | |||
4023 | 4024 | ||
4024 | HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS | 4025 | HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS |
4025 | M: Thomas Gleixner <tglx@linutronix.de> | 4026 | M: Thomas Gleixner <tglx@linutronix.de> |
4027 | L: linux-kernel@vger.kernel.org | ||
4026 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core | 4028 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core |
4027 | S: Maintained | 4029 | S: Maintained |
4028 | F: Documentation/timers/ | 4030 | F: Documentation/timers/ |
@@ -4694,6 +4696,7 @@ F: net/irda/ | |||
4694 | 4696 | ||
4695 | IRQ SUBSYSTEM | 4697 | IRQ SUBSYSTEM |
4696 | M: Thomas Gleixner <tglx@linutronix.de> | 4698 | M: Thomas Gleixner <tglx@linutronix.de> |
4699 | L: linux-kernel@vger.kernel.org | ||
4697 | S: Maintained | 4700 | S: Maintained |
4698 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core | 4701 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core |
4699 | F: kernel/irq/ | 4702 | F: kernel/irq/ |
@@ -5325,6 +5328,7 @@ F: drivers/media/usb/dvb-usb-v2/lmedm04* | |||
5325 | LOCKDEP AND LOCKSTAT | 5328 | LOCKDEP AND LOCKSTAT |
5326 | M: Peter Zijlstra <peterz@infradead.org> | 5329 | M: Peter Zijlstra <peterz@infradead.org> |
5327 | M: Ingo Molnar <mingo@redhat.com> | 5330 | M: Ingo Molnar <mingo@redhat.com> |
5331 | L: linux-kernel@vger.kernel.org | ||
5328 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking | 5332 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking |
5329 | S: Maintained | 5333 | S: Maintained |
5330 | F: Documentation/lockdep*.txt | 5334 | F: Documentation/lockdep*.txt |
@@ -6622,6 +6626,7 @@ M: Peter Zijlstra <a.p.zijlstra@chello.nl> | |||
6622 | M: Paul Mackerras <paulus@samba.org> | 6626 | M: Paul Mackerras <paulus@samba.org> |
6623 | M: Ingo Molnar <mingo@redhat.com> | 6627 | M: Ingo Molnar <mingo@redhat.com> |
6624 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 6628 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> |
6629 | L: linux-kernel@vger.kernel.org | ||
6625 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core | 6630 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core |
6626 | S: Supported | 6631 | S: Supported |
6627 | F: kernel/events/* | 6632 | F: kernel/events/* |
@@ -6745,6 +6750,7 @@ F: drivers/scsi/pm8001/ | |||
6745 | 6750 | ||
6746 | POSIX CLOCKS and TIMERS | 6751 | POSIX CLOCKS and TIMERS |
6747 | M: Thomas Gleixner <tglx@linutronix.de> | 6752 | M: Thomas Gleixner <tglx@linutronix.de> |
6753 | L: linux-kernel@vger.kernel.org | ||
6748 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core | 6754 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core |
6749 | S: Supported | 6755 | S: Supported |
6750 | F: fs/timerfd.c | 6756 | F: fs/timerfd.c |
@@ -7153,6 +7159,7 @@ F: drivers/net/wireless/ray* | |||
7153 | RCUTORTURE MODULE | 7159 | RCUTORTURE MODULE |
7154 | M: Josh Triplett <josh@freedesktop.org> | 7160 | M: Josh Triplett <josh@freedesktop.org> |
7155 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> | 7161 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> |
7162 | L: linux-kernel@vger.kernel.org | ||
7156 | S: Supported | 7163 | S: Supported |
7157 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git | 7164 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git |
7158 | F: Documentation/RCU/torture.txt | 7165 | F: Documentation/RCU/torture.txt |
@@ -7160,6 +7167,7 @@ F: kernel/rcu/torture.c | |||
7160 | 7167 | ||
7161 | RCUTORTURE TEST FRAMEWORK | 7168 | RCUTORTURE TEST FRAMEWORK |
7162 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> | 7169 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> |
7170 | L: linux-kernel@vger.kernel.org | ||
7163 | S: Supported | 7171 | S: Supported |
7164 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git | 7172 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git |
7165 | F: tools/testing/selftests/rcutorture | 7173 | F: tools/testing/selftests/rcutorture |
@@ -7183,6 +7191,7 @@ F: net/rds/ | |||
7183 | READ-COPY UPDATE (RCU) | 7191 | READ-COPY UPDATE (RCU) |
7184 | M: Dipankar Sarma <dipankar@in.ibm.com> | 7192 | M: Dipankar Sarma <dipankar@in.ibm.com> |
7185 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> | 7193 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> |
7194 | L: linux-kernel@vger.kernel.org | ||
7186 | W: http://www.rdrop.com/users/paulmck/RCU/ | 7195 | W: http://www.rdrop.com/users/paulmck/RCU/ |
7187 | S: Supported | 7196 | S: Supported |
7188 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git | 7197 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git |
@@ -7492,6 +7501,7 @@ F: drivers/mmc/host/dw_mmc* | |||
7492 | TIMEKEEPING, CLOCKSOURCE CORE, NTP | 7501 | TIMEKEEPING, CLOCKSOURCE CORE, NTP |
7493 | M: John Stultz <john.stultz@linaro.org> | 7502 | M: John Stultz <john.stultz@linaro.org> |
7494 | M: Thomas Gleixner <tglx@linutronix.de> | 7503 | M: Thomas Gleixner <tglx@linutronix.de> |
7504 | L: linux-kernel@vger.kernel.org | ||
7495 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core | 7505 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core |
7496 | S: Supported | 7506 | S: Supported |
7497 | F: include/linux/clocksource.h | 7507 | F: include/linux/clocksource.h |
@@ -7517,6 +7527,7 @@ F: drivers/watchdog/sc1200wdt.c | |||
7517 | SCHEDULER | 7527 | SCHEDULER |
7518 | M: Ingo Molnar <mingo@redhat.com> | 7528 | M: Ingo Molnar <mingo@redhat.com> |
7519 | M: Peter Zijlstra <peterz@infradead.org> | 7529 | M: Peter Zijlstra <peterz@infradead.org> |
7530 | L: linux-kernel@vger.kernel.org | ||
7520 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core | 7531 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core |
7521 | S: Maintained | 7532 | S: Maintained |
7522 | F: kernel/sched/ | 7533 | F: kernel/sched/ |
@@ -7884,6 +7895,7 @@ F: mm/sl?b.c | |||
7884 | SLEEPABLE READ-COPY UPDATE (SRCU) | 7895 | SLEEPABLE READ-COPY UPDATE (SRCU) |
7885 | M: Lai Jiangshan <laijs@cn.fujitsu.com> | 7896 | M: Lai Jiangshan <laijs@cn.fujitsu.com> |
7886 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> | 7897 | M: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> |
7898 | L: linux-kernel@vger.kernel.org | ||
7887 | W: http://www.rdrop.com/users/paulmck/RCU/ | 7899 | W: http://www.rdrop.com/users/paulmck/RCU/ |
7888 | S: Supported | 7900 | S: Supported |
7889 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git | 7901 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git |
@@ -9587,6 +9599,7 @@ M: Thomas Gleixner <tglx@linutronix.de> | |||
9587 | M: Ingo Molnar <mingo@redhat.com> | 9599 | M: Ingo Molnar <mingo@redhat.com> |
9588 | M: "H. Peter Anvin" <hpa@zytor.com> | 9600 | M: "H. Peter Anvin" <hpa@zytor.com> |
9589 | M: x86@kernel.org | 9601 | M: x86@kernel.org |
9602 | L: linux-kernel@vger.kernel.org | ||
9590 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core | 9603 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core |
9591 | S: Maintained | 9604 | S: Maintained |
9592 | F: Documentation/x86/ | 9605 | F: Documentation/x86/ |