From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Mar 2020 16:54:59 +0000 (-0700)
Subject: Merge tag 'trace-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: ceph-for-5.6-rc8~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=36feb996308ec3392495e3341bab2570b11cb1bd;p=ceph-client.git

Merge tag 'trace-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull ftrace fix from Steven Rostedt:
 "Have ftrace lookup_rec() return a consistent record otherwise it can
  break live patching"

* tag 'trace-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace: Return the first found result in lookup_rec()
---

36feb996308ec3392495e3341bab2570b11cb1bd