From: Ingo Molnar Date: Fri, 13 May 2016 05:35:12 +0000 (+0200) Subject: Merge tag 'perf-urgent-for-mingo-20160512' of git://git.kernel.org/pub/scm/linux... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=636fa4a7b0d2987b7395cd2e259962cdca16e887;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'perf-urgent-for-mingo-20160512' of git://git./linux/kernel/git/acme/linux into perf/urgent Pull perf/urgent fixes from Arnaldo Carvalho de Melo: - Fallback to usermode-only counters when perf_event_paranoid > 1, which is the case now (Arnaldo Carvalho de Melo) - Do not reassign parg after collapse_tree() in libtraceevent, which may cause tool crashes (Steven Rostedt) - Fix the build on Fedora Rawhide, where readdir_r() is deprecated and also wrt -Werror=unused-const-variable= + x86_32_regoffset_table on !x86_64 (Arnaldo Carvalho de Melo) - Fix the build on Ubuntu 12.04.5, where dwarf_getlocations() isn't available, i.e. libdw-dev < 0.157 (Arnaldo Carvalho de Melo) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ingo Molnar --- 636fa4a7b0d2987b7395cd2e259962cdca16e887