Commit 51825c8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 62ea1ec5 4e93ad60

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/blackfin/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar

 *  Copyright (C) 2009 Jaswinder Singh Rajput

 *  Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter

 *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>

 *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra

 *  Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>

 *

 * ppc:

arch/sh/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar

 *  Copyright (C) 2009 Jaswinder Singh Rajput

 *  Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter

 *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>

 *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra

 *  Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>

 *

 * ppc:

arch/sparc/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar

 *  Copyright (C) 2009 Jaswinder Singh Rajput

 *  Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter

 *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>

 *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra

 */



#include <linux/perf_event.h>

arch/tile/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar

 *  Copyright (C) 2009 Jaswinder Singh Rajput

 *  Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter

 *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>

 *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra

 *  Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>

 *  Copyright (C) 2009 Google, Inc., Stephane Eranian

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE