1. 21 Mar, 2013 2 commits
    • Ingo Molnar's avatar
      Merge tag 'perf-core-for-mingo' of... · 0a119538
      Ingo Molnar authored
      Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      [ resolved the trivial merge conflict with upstream ]
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      0a119538
    • Ingo Molnar's avatar
      Merge branch 'perf/urgent' into perf/core · 3bf23917
      Ingo Molnar authored
      Merge in all pending fixes, before pulling the latest development
      bits from Arnaldo - which will involve merge conflicts.
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      3bf23917
  2. 18 Mar, 2013 10 commits
  3. 15 Mar, 2013 28 commits