projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e0283a ac01ce1)
Merge tag 'trace-fixes-v4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 May 2015 01:22:05 +0000 (18:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 May 2015 01:22:05 +0000 (18:22 -0700)
commit26b293e854406ea4276b566cef75426adc3a9688
tree66e90d9a3eb4741edba3701c210fe29ba4b4acaftree | snapshot
parent3e0283a53f7d2f2dae7bc4aa7f3104cb5988018fcommit | diff
parentac01ce1410fc2c7b5f3af5e9c972e6a412eee54fcommit | diff
Merge tag 'trace-fixes-v4.1-rc2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "The newly added ftrace_print_array_seq() function had a bug in it.
  Luckily, the only user of it didn't make the 4.1 merge window.

  But the helper function should be fixed before 4.2 when the users
  start coming in"

* tag 'trace-fixes-v4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Make ftrace_print_array_seq compute buf_len
Linux 6.x block layer and io_uring tree(s)