From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Jul 2020 19:35:07 +0000 (-0700)
Subject: Merge tag 'perf-tools-fixes-2020-07-19' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.10.7~2102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92188b41f1394d5e4399fcb28c13a2933f255255;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'perf-tools-fixes-2020-07-19' of git://git./linux/kernel/git/acme/linux into master

Pull perf tooling fixes from Arnaldo Carvalho de Melo:

 - Update hashmap.h from libbpf and kvm.h from x86's kernel UAPI.

 - Set opt->set in libsubcmd's OPT_CALLBACK_SET(). This fixes
   'perf record --switch-output-event event-name' usage"

* tag 'perf-tools-fixes-2020-07-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  tools arch kvm: Sync kvm headers with the kernel sources
  perf tools: Sync hashmap.h with libbpf's
  libsubcmd: Fix OPT_CALLBACK_SET()
---

92188b41f1394d5e4399fcb28c13a2933f255255