Patches contributed by Eötvös Lorand University
commit 1ecc818c51b1f6886825dae3885792d5e49ec798
Merge: 1c09ab0d2573 d902db1eb603
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 1 13:20:51 2011 +0200
Merge branch 'sched/core-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into sched/core
commit 343a031f3c4a7a663192cf56368bb5a6c56870c0
Merge: 26ca5c11fb45 cb1955b86c86
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 1 11:51:58 2011 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
commit 36b2e922b5acd291051fab25bc7535274ce49532
Merge: e197f094b7da b0af8dfdd676
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 1 10:34:09 2011 +0200
Merge commit 'v3.0-rc5' into sched/core
Merge reason: Move to a (much) newer base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 10e6962765f8213941eaa1cbb9de425ff0689e2e
Merge: af07ce3e77d3 b0af8dfdd676
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jul 1 10:28:42 2011 +0200
Merge commit 'v3.0-rc5' into perf/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit debf1d4948bccf58fa172acb1a7306792d77705d
Merge: e08f6d4131ab 8fe7e94eb714
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 22 16:25:34 2011 +0200
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
commit c1f5c54b57341e872a9d375dccef7257f86033ef
Author: Ingo Molnar <mingo@elte.hu>
Date: Sat Jun 18 22:51:13 2011 +0200
x86, MAINTAINERS: Add x86 MCE people
Announce the new x86 MCE infrastructure maintainers.
Acked-by: Borislav Petkov <bp@amd64.org>
Acked-by: Tony Luck <tony.luck@intel.com>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/n/tip-8hs7yob6wib4vblmrmbpbav4@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/MAINTAINERS b/MAINTAINERS
index 502f2dd761eb..b12b8c13f53a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7007,6 +7007,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.
S: Maintained
F: drivers/platform/x86
+X86 MCE INFRASTRUCTURE
+M: Tony Luck <tony.luck@intel.com>
+M: Borislav Petkov <bp@amd64.org>
+L: linux-edac@vger.kernel.org
+S: Maintained
+F: arch/x86/kernel/cpu/mcheck/*
+
XEN HYPERVISOR INTERFACE
M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
commit af07ce3e77d3b24ab1d71fcc5833d41800f23b2b
Merge: b4f9f2b64aa1 0ef5bf1cd3bd
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jun 16 13:26:23 2011 +0200
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Conflicts:
Makefile
diff --cc Makefile
index badb9239e2bb,e7d01adaf692..cb6bdab8947b
--- a/Makefile
+++ b/Makefile
@@@ -1290,11 -1267,7 +1290,12 @@@ help
@echo ' make O=dir [targets] Locate all output files in "dir", including .config'
@echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)'
@echo ' make C=2 [targets] Force check of all c source with $$CHECK'
- @echo ' make W=1 [targets] Enable extra gcc checks'
++ @echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
+ @echo ' make W=n [targets] Enable extra gcc checks, n=1,2,3 where'
+ @echo ' 1: warnings which may be relevant and do not occur too often'
+ @echo ' 2: warnings which occur quite often but may still be relevant'
+ @echo ' 3: more obscure warnings, can most likely be ignored'
+ @echo ' Multiple levels can be combined with W=12 or W=123'
@echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
@echo ''
@echo 'Execute "make" or "make all" to build all targets marked with [*] '
commit b4f9f2b64aa189c5584f266f4f0343af7a705441
Merge: 76369139ceb9 2c53b436a308
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jun 16 13:23:15 2011 +0200
Merge commit 'v3.0-rc3' into perf/core
Merge reason: add the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit afbee42706090fa59dac299c9607e4fd4361ec82
Merge: 5f127133ee43 db5e7ecc4abc
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jun 13 11:59:42 2011 +0200
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
commit 5f127133ee432d0b83ee26e8e3a3d7828ab5f2b1
Merge: 5cf42f705564 fe47ae7f53e1
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jun 9 09:14:34 2011 +0200
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent