git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit36feb996308ec3392495e3341bab2570b11cb1bd
tree311449231513733558e0e7976fea2d5ecd366e22tree
parentc7f26a0ce61eb51a4849bdf3268bedd251b6dbc6commit | diff
parentd9815bff6b379ff46981bea9dfeb146081eab314commit | diff
Merge tag 'trace-v5.6-rc4' of git://git./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()
Unnamed repository; edit this file 'description' to name the repository.