Patches contributed by Eötvös Lorand University
commit ea281a9ebaba3287130dbe15bb0aad6f798bb06b
Merge: cd593accdcc2 fadd85f16a8e
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 14 07:44:48 2012 +0100
Merge tag 'mce-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce
Apply two miscellaneous MCE fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit cd593accdcc27ccbe6498d9ad1c2b6cc8e1d830d
Merge: 11b91d6fe727 fde7d9049e55
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 14 07:44:11 2012 +0100
Merge tag 'v3.3-rc7' into x86/mce
Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit ef15eda98217f5183f457e7a2de8b79555ef908b
Merge: 5cb4ac3a583d ef334a20d84f
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 13 16:32:54 2012 +0100
Merge branch 'x86/cleanups' into perf/uprobes
Merge reason: We want to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --cc arch/x86/kernel/cpu/perf_event.c
index 3c44b712380c,63c0e058a405..1c52bdbb9b8b
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@@ -29,10 -28,8 +29,9 @@@
#include <asm/apic.h>
#include <asm/stacktrace.h>
#include <asm/nmi.h>
- #include <asm/compat.h>
#include <asm/smp.h>
#include <asm/alternative.h>
+#include <asm/timer.h>
#include "perf_event.h"
commit 47258cf3c4aa5d56e678bafe0dd0d03ddd980b88
Merge: c308b56b5398 fde7d9049e55
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 13 16:26:52 2012 +0100
Merge tag 'v3.3-rc7' into sched/core
Merge reason: merge back final fixes, prepare for the merge window.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit e898c6706869fdcbd68b1e7fb0ac7461d98710fe
Merge: c94082656dac 55283e253771
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 13 05:54:39 2012 +0100
Merge branch 'x86/x32' into x86/cleanups
Merge reason: We are going to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit bea95c152dee1791dd02cbc708afbb115bb00f9a
Merge: f9b4eeb809c6 24bff2dc0f77
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 12 20:46:35 2012 +0100
Merge branch 'perf/hw-branch-sampling' into perf/core
Merge reason: The 'perf record -b' hardware branch sampling feature is ready for upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 35239e23c66f1614c76739b62a299c3c92d6eb68
Merge: 3f33ab1c0c74 87e24f4b67e6
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 12 20:44:07 2012 +0100
Merge branch 'perf/urgent' into perf/core
Merge reason: We are going to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit a5c2edf5765a6efedfd862bce6c616bfec46306a
Merge: e37aade31601 b11e3d782b9c
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 7 14:44:35 2012 +0100
Merge tag 'mce-fix-for-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/urgent
Fix a reproducible RCU warning in the MCE code
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 262760894c60f0527b319327918dc41cb4b33df5
Merge: 737f24bda723 ff2a6617c2ac
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 5 16:59:02 2012 +0100
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Improvements for 'perf annotate' from Namhyung Kim.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 737f24bda723fdf89ecaacb99fa2bf5683c32799
Merge: 8eedce996556 b7c924274c45
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 5 09:20:08 2012 +0100
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/perf.h
tools/perf/util/top.h
Merge reason: resolve these cherry-picking conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>