From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Jun 2017 18:55:21 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~681
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35d8d5d47c0ef066197f629f71cdd6039693b86d;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Thomas Gleixner:
 "Three fixlets for perf:

   - Return the proper error code if aux buffers for a event are not
     supported.

   - Calculate the probe offset for inlined functions correctly

   - Update the Skylake DTLB load/store miss event so it can count 1G
     TLB entries as well"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf probe: Fix probe definition for inlined functions
  perf/x86/intel: Add 1G DTLB load/store miss support for SKL
  perf/aux: Correct return code of rb_alloc_aux() if !has_aux(ev)
---

35d8d5d47c0ef066197f629f71cdd6039693b86d