Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Wed, 26 Sep 2012 06:57:22 +0000 (08:57 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 26 Sep 2012 06:57:22 +0000 (08:57 +0200)
commita91f408e4435d4f572392295ee47756b6f5011c7
tree298177b72d51218a69ffd92a940029c13a3bdde6
parentf74eb728687afbf239abe2ea66921583db4eaa4b
parentf1b2256d66fe8d613b9afcc1c16079362f9fc05c
Merge tag 'perf-core-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/core

Pull perf/core fixes from Arnaldo Carvalho de Melo:

 * The new perf_evsel__tp_sched_test 'perf test' broke the build by setting the
   'ret' variable but not using it, caught by newer gcc
   -Werror=unused-but-set-variable, fix from Namhyung Kim.

 * pevent_parse_event should return a proper PEVENT_ERRNO__ and call
   pevent_free_format on its failure path, fixes from Namhyung Kim.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>