Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull perf fixes from Ingo Molnar:
 "These are late-v3.7 pending fixes for tracing."

Fix up trivial conflict in kernel/trace/ring_buffer.c: the NULL pointer
fix clashed with the change of type of the 'ret' variable.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ring-buffer: Fix race between integrity check and readers
  ring-buffer: Fix NULL pointer if rb_set_head_page() fails
  ftrace: Clear bits properly in reset_iter_read()

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
index 3c7834c24e54e6630a286423cfd17ba3d6b61350,4cb5e51471656a50aa2897f42ae6c4aee5333c00..ce8514feedcdf29c181dda4972eb7a53cd0df04e
--- 1/kernel/trace/ring_buffer.c
--- 2/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@@ -2937,7 -2936,7 +2939,7 @@@ u64 ring_buffer_oldest_event_ts(struct 
        unsigned long flags;
        struct ring_buffer_per_cpu *cpu_buffer;
        struct buffer_page *bpage;
-       u64 ret;
 -      unsigned long ret = 0;
++      u64 ret = 0;
  
        if (!cpumask_test_cpu(cpu, buffer->cpumask))
                return 0;