Merge branches 'tracing/blktrace', 'tracing/ftrace' and 'tracing/urgent' into tracing...

diff --cc kernel/trace/Kconfig
Simple merge

diff --cc kernel/trace/trace_selftest.c
index 0c9aa1457e51f729ee740bb78cccbd392c8b13d1,01415f4edaa57c4508c6bd3acef4531120a04a02,bc8e80a86bca4c0cf730fcf6b7bc568f2808f7e7..7238646b8723e388db9073249d82946c16fe6545
--- 1/kernel/trace/trace_selftest.c
--- 2/kernel/trace/trace_selftest.c
--- 3/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@@@ -619,10 -619,10 -589,10 +638,10 @@@@ trace_selftest_startup_sysprof(struct t
        int ret;
   
        /* start the tracing */
  -     ret = trace->init(tr);
  +     ret = tracer_init(trace, tr);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
- -             return 0;
+ +             return ret;
        }
   
        /* Sleep for a 1/10 of a second */