From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 21 Mar 2013 10:06:12 +0000 (+0100)
Subject: Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=commitdiff_plain;h=0a11953851213fd1d3eebcb68b4a537d458c70c2

Merge tag 'perf-core-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/core

Conflicts:
	tools/Makefile

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

. Honor parallel jobs, fix from Borislav Petkov

. Introduce tools/lib/lk library, initially just removing duplication
  among tools/perf and tools/vm. from Borislav Petkov

. Fix build on non-glibc systems due to libio.h absence, from Cody P Schafer.

. Remove some perf_session and tracing dead code, from David Ahern.

. Introduce perf stat --repeat forever, from Frederik Deweerdt.

. Add perf test entries for checking --cpu in record and stat, from Jiri Olsa.

. Add perf test entries for checking breakpoint overflow signal handler issues,
  from Jiri Olsa.

. Add perf test entry for for checking number of EXIT events, from Namhyung Kim.

. Simplify some perf_evlist methods and to allow 'stat' to share code with
  'record' and 'trace'.

. Remove dead code in related to libtraceevent integration, from Namhyung Kim.

. Event group view for 'annotate' in --stdio, --tui and --gtk, from Namhyung Kim.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
[ resolved the trivial merge conflict with upstream ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

0a11953851213fd1d3eebcb68b4a537d458c70c2
diff --cc tools/Makefile
index fa36565b209d,623b1cd86cb3..6aaeb6cd867d
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -34,7 -33,13 +34,13 @@@ help
  cpupower: FORCE
  	$(call descend,power/$@)
  
- cgroup firewire lguest perf usb virtio vm: FORCE
 -firewire guest usb virtio vm: FORCE
++cgroup firewire guest usb virtio vm: FORCE
+ 	$(call descend,$@)
+ 
+ liblk: FORCE
+ 	$(call descend,lib/lk)
+ 
+ perf: liblk FORCE
  	$(call descend,$@)
  
  selftests: FORCE
@@@ -62,7 -67,13 +68,13 @@@ install: cgroup_install cpupower_instal
  cpupower_clean:
  	$(call descend,power/cpupower,clean)
  
- cgroup_clean firewire_clean lguest_clean perf_clean usb_clean virtio_clean vm_clean:
 -firewire_clean lguest_clean usb_clean virtio_clean vm_clean:
++cgroup_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean:
+ 	$(call descend,$(@:_clean=),clean)
+ 
+ liblk_clean:
+ 	$(call descend,lib/lk,clean)
+ 
+ perf_clean: liblk_clean
  	$(call descend,$(@:_clean=),clean)
  
  selftests_clean: