diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-08 13:01:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-08 13:01:23 -0800 |
| commit | 51825c8a869e5df6bdfb7b2baf4a3cc7f337d34e (patch) | |
| tree | 6ee6965514d3e3e7397c1f6ce1bcf60294393b6c /MAINTAINERS | |
| parent | 62ea1ec5e17fe36e2c728bc534f9f78b216dfe83 (diff) | |
| parent | 4e93ad601a4308d4a67673c81556580817d56940 (diff) | |
| download | linux-artik7-51825c8a869e5df6bdfb7b2baf4a3cc7f337d34e.tar.gz linux-artik7-51825c8a869e5df6bdfb7b2baf4a3cc7f337d34e.tar.bz2 linux-artik7-51825c8a869e5df6bdfb7b2baf4a3cc7f337d34e.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"This tree includes four core perf fixes for misc bugs, three fixes to
x86 PMU drivers, and two updates to old email addresses"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Do not send exit event twice
perf/x86/intel: Fix INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA macro
perf/x86/intel: Make L1D_PEND_MISS.FB_FULL not constrained on Haswell
perf: Fix PERF_EVENT_IOC_PERIOD deadlock
treewide: Remove old email address
perf/x86: Fix LBR call stack save/restore
perf: Update email address in MAINTAINERS
perf/core: Robustify the perf_cgroup_from_task() RCU checks
perf/core: Fix RCU problem with cgroup context switching code
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 69c8a9c3289a..38df53f828e1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8286,7 +8286,7 @@ F: include/linux/delayacct.h F: kernel/delayacct.c PERFORMANCE EVENTS SUBSYSTEM -M: Peter Zijlstra <a.p.zijlstra@chello.nl> +M: Peter Zijlstra <peterz@infradead.org> M: Ingo Molnar <mingo@redhat.com> M: Arnaldo Carvalho de Melo <acme@kernel.org> L: linux-kernel@vger.kernel.org |