From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jul 2017 20:59:51 +0000 (-0700)
Subject: Merge tag 'trace-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f79ec886f994918de057dd224fa2dfdc162bb3c3;p=linux.git

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

Pull tracing fixes from Steven Rostedt:
 "Three minor updates

   - Use the new GFP_RETRY_MAYFAIL to be more aggressive in allocating
     memory for the ring buffer without causing OOMs

   - Fix a memory leak in adding and removing instances

   - Add __rcu annotation to be able to debug RCU usage of function
     tracing a bit better"

* tag 'trace-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  trace: fix the errors caused by incompatible type of RCU variables
  tracing: Fix kmemleak in instance_rmdir
  tracing/ring_buffer: Try harder to allocate
---

f79ec886f994918de057dd224fa2dfdc162bb3c3