From: Ingo Molnar Date: Tue, 8 Mar 2016 09:15:43 +0000 (+0100) Subject: Merge branch 'email/acme' into perf/core X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b9461ba85f11de61d11ad4e13c806ff174ddf577;p=linux-beck.git Merge branch 'email/acme' into perf/core Merge perf/core improvements and fixes from Arnaldo Carvalho de Melo: User visible changes: - Allow grouping multiple sort keys per 'perf report/top --hierarchy' level (Namhyung Kim) - Document 'perf stat --detailed' option (Borislav Petkov) Infrastructure changes: - jitdump prep work for supporting it with Intel PT (Adrian Hunter) - Use 64-bit shifts with (TSC) time conversion (Adrian Hunter) Fixes: - Explicitly declare inc_group_count as a void function (Colin Ian King) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ingo Molnar --- b9461ba85f11de61d11ad4e13c806ff174ddf577