Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Mon, 28 Oct 2013 14:56:50 +0000 (15:56 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 28 Oct 2013 14:56:50 +0000 (15:56 +0100)
commitd17cccbea95933a2ab3e260fab128f5128c9371f
treeb3fb0d0e26c741aa14a9bfa6bceb5ec7e740bb62
parent959f58544b7f20c92d5eb43d1232c96c15c01bfb
parent2fd869f08aec5a8e4cbf01bc3fa345c4e53342d7
Merge tag 'perf-urgent-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

* Fix up /proc/PID/maps parsing, where perfectly fine mmap entries
  were being trown away when synthesizing PERF_RECORD_MMAP for
  preexisting threads, prevenging symbol resolution to work
  for those threads, broken in the MMAP2 removal. Reported and
  pinpointed by Markus Trippelsdorf,

* Fix mem leak in the python 'perf script' backend, due to missing Py_DECREFs
  on dict entries, fix from Joseph Schuchart.

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