projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7f26a0 d9815bf)
Merge tag 'trace-v5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Mar 2020 16:54:59 +0000 (09:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Mar 2020 16:54:59 +0000 (09:54 -0700)
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()


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git