From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 3 Jun 2018 17:11:38 +0000 (+0200)
Subject: Merge tag 'perf-urgent-for-mingo-4.17-20180602' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4e9ae0d3d5bf4e2f1b466ba451bd18f2c5b69845;p=linux.git

Merge tag 'perf-urgent-for-mingo-4.17-20180602' of git://git./linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Carvalho de Melo:

- Update prctl and cpufeatures.h tools/ copies with the kernel sources
  originals, which makes 'perf trace' know about the new prctl options
  for speculation control and silences the build warnings (Arnaldo Carvalho de Melo)

- Update insn.h in Intel-PT instruction decoder with its original from from the
  kernel sources, to silence build warnings, no effect on the actual tools this
  time around (Arnaldo Carvalho de Melo)

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

4e9ae0d3d5bf4e2f1b466ba451bd18f2c5b69845