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

* 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

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/nmi.c
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge