From: Dhaval Giani <dhaval.giani@oracle.com>
Date: Wed, 11 Jan 2017 19:31:04 +0000 (-0500)
Subject: Merge branch topic/uek-4.1/dtrace of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=be998c11567b1ad57441200fb787945099e9133e;p=users%2Fjedix%2Flinux-maple.git

Merge branch topic/uek-4.1/dtrace of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* origin/topic/uek-4.1/dtrace:
  dtrace: function boundary tracing (FBT)
  dtrace: add support for passing return value from trap handlers
  dtrace: ensure that our die notifier gets executed amongst the first
  dtrace: allow invop handler to specify number of insns to skip
  dtrace: is-enabled probes for SDT
  dtrace: check for errors when getting a new fd
  dtrace: take mmap_sem in PTRACE_GETMAPFD
---

be998c11567b1ad57441200fb787945099e9133e