Merge 'origin/master' into perf-tools-next

To get the fixes in the perf-tools branch.  Resolved a conflict due to
RISC-V's syscall table change.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --cc tools/perf/Makefile.config
Simple merge

diff --cc tools/perf/builtin-trace.c
Simple merge

diff --cc tools/perf/util/syscalltbl.c
index 349986f,6c45ded..69d8dcf
--- 1/tools/perf/util/syscalltbl.c
--- 2/tools/perf/util/syscalltbl.c
+++ b/tools/perf/util/syscalltbl.c
@@@ -46,10 -46,11 +46,15 @@@ static const char *const *syscalltbl_na
  #include <asm/syscalls.c>
  const int syscalltbl_native_max_id = SYSCALLTBL_LOONGARCH_MAX_ID;
  static const char *const *syscalltbl_native = syscalltbl_loongarch;
 +#elif defined(__riscv)
 +#include <asm/syscalls.c>
 +const int syscalltbl_native_max_id = SYSCALLTBL_RISCV_MAX_ID;
 +static const char *const *syscalltbl_native = syscalltbl_riscv;
+ #else
+ const int syscalltbl_native_max_id = 0;
+ static const char *const syscalltbl_native[] = {
+       [0] = "unknown",
+ };
  #endif
  
  struct syscall {