From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 May 2018 03:38:37 +0000 (-1000)
Subject: Merge tag 'trace-v4.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted... 
X-Git-Tag: v4.19~1096
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4ef6a438cee86ca0c6d1b889aa53bec9c1f9de6;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'trace-v4.17-rc1-2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Various fixes in tracing:

   - Tracepoints should not give warning on OOM failures

   - Use special field for function pointer in trace event

   - Fix igrab issues in uprobes

   - Fixes to the new histogram triggers"

* tag 'trace-v4.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracepoint: Do not warn on ENOMEM
  tracing: Add field modifier parsing hist error for hist triggers
  tracing: Add field parsing hist error for hist triggers
  tracing: Restore proper field flag printing when displaying triggers
  tracing: initcall: Ordered comparison of function pointers
  tracing: Remove igrab() iput() call from uprobes.c
  tracing: Fix bad use of igrab in trace_uprobe.c
---

f4ef6a438cee86ca0c6d1b889aa53bec9c1f9de6