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

* topic/uek-4.1/dtrace:
  dtrace: get rid of dtrace_gethrtime
  dtrace: drop spurious debugging left in by accident
  dtrace: comtinuing the FBT implementation and fixes
  dtrace: ensure DTrace can use get_user_pages safely
  dtrace: enable paranoid mode and IST shift for xen_int3
  dtrace: ensure we skip the entire SDT probe point
  dtrace: add ip SDT provider

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

diff --cc kernel/fork.c
Simple merge

diff --cc mm/gup.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv6/mcast.c
Simple merge