Jens Axboe b28bc9b38c Merge tag 'v3.13-rc6' into for-3.14/core ...

Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.

Fixup merge issues related to the immutable biovec changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Conflicts:
	block/blk-flush.c
	fs/btrfs/check-integrity.c
	fs/btrfs/extent_io.c
	fs/btrfs/scrub.c
	fs/logfs/dev_bdev.c

2013-12-31 09:51:02 -07:00

..

blktrace.c

block: Abstract out bvec iterator

2013-11-23 22:33:47 -08:00

ftrace.c

ftrace: Initialize the ftrace profiler for each possible cpu

2013-12-16 10:53:46 -05:00

Kconfig

ring-buffer: Select IRQ_WORK

2013-05-03 19:24:17 -04:00

Makefile

trace: Stop compiling in trace_clock unconditionally

2012-09-13 22:52:08 -04:00

power-traces.c

PM / tracing: remove deprecated power trace API

2013-01-26 00:39:12 +01:00

ring_buffer_benchmark.c

…

ring_buffer.c

tracing: Typo fix on ring buffer comments

2013-07-18 21:31:26 -04:00

rpm-traces.c

…

trace_branch.c

tracing: Update event filters for multibuffer

2013-11-05 16:50:20 -05:00

trace_clock.c

tracing: Add "uptime" trace clock that uses jiffies

2013-03-15 00:36:09 -04:00

trace_entries.h

tracing: Add trace_puts() for even faster trace_printk() tracing

2013-03-15 00:35:55 -04:00

trace_event_perf.c

perf/trace: Properly use u64 to hold event_id

2013-11-19 16:57:44 +01:00

trace_events_filter_test.h

…

trace_events_filter.c

tracing: Update event filters for multibuffer

2013-11-05 16:50:20 -05:00

trace_events.c

tracing: Only run synchronize_sched() at instance deletion time

2013-12-05 14:22:30 -05:00

trace_export.c

tracing: Update event filters for multibuffer

2013-11-05 16:50:20 -05:00

trace_functions_graph.c

tracing: Do not use signed enums with unsigned long long in fgragh output

2013-11-06 15:26:56 -05:00

trace_functions.c

tracing: Add ref_data to function and fgraph tracer structs

2013-07-18 21:31:31 -04:00

trace_irqsoff.c

tracing: Use flag buffer_disabled for irqsoff tracer

2013-07-01 20:34:28 -04:00

trace_kdb.c

tracing: Consolidate max_tr into main trace_array structure

2013-03-15 00:35:40 -04:00

trace_kprobe.c

tracing: Update event filters for multibuffer

2013-11-05 16:50:20 -05:00

trace_mmiotrace.c

tracing: Update event filters for multibuffer

2013-11-05 16:50:20 -05:00

trace_nop.c

…

trace_output.c

ftrace, sched: Add TRACE_FLAG_PREEMPT_RESCHED

2013-11-11 12:43:39 +01:00

trace_output.h

tracing: Rename trace_event_mutex to trace_event_sem

2013-03-15 13:22:10 -04:00

trace_printk.c

tracing: Add __tracepoint_string() to export string pointers

2013-07-26 13:39:44 -04:00

trace_probe.c

tracing: Replace strict_strto* with kstrto*

2012-10-31 16:45:23 -04:00

trace_probe.h

uprobes/tracing: Introduce is_trace_uprobe_enabled()

2013-02-08 18:24:30 +01:00

trace_sched_switch.c

tracing: Update event filters for multibuffer

2013-11-05 16:50:20 -05:00

trace_sched_wakeup.c

tracing: Add function-trace option to disable function tracing of latency tracers

2013-03-15 00:36:08 -04:00

trace_selftest_dynamic.c

…

trace_selftest.c

ftrace: Do not run selftest if command line parameter is set

2013-07-01 20:57:15 -04:00

trace_stack.c

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

2013-04-29 13:55:38 -07:00

trace_stat.c

trace/trace_stat: use rbtree postorder iteration helper instead of opencoding

2013-11-05 16:01:47 -05:00

trace_stat.h

…

trace_syscalls.c

tracing: Only run synchronize_sched() at instance deletion time

2013-12-05 14:22:30 -05:00

trace_uprobe.c

tracing: Update event filters for multibuffer

2013-11-05 16:50:20 -05:00

trace.c

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

2013-11-16 12:23:18 -08:00

trace.h

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

2013-11-16 12:23:18 -08:00